Module Name: src Committed By: snj Date: Wed Jan 3 20:46:44 UTC 2018
Modified Files: src/sys/external/bsd/drm2/drm [netbsd-7-0]: drm_drv.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #1536): sys/external/bsd/drm2/drm/drm_drv.c: 1.20 drm_stat: fix device minor calculation, ok riastradh@ To generate a diff of this commit: cvs rdiff -u -r1.9.2.4 -r1.9.2.4.2.1 src/sys/external/bsd/drm2/drm/drm_drv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/external/bsd/drm2/drm/drm_drv.c diff -u src/sys/external/bsd/drm2/drm/drm_drv.c:1.9.2.4 src/sys/external/bsd/drm2/drm/drm_drv.c:1.9.2.4.2.1 --- src/sys/external/bsd/drm2/drm/drm_drv.c:1.9.2.4 Tue Mar 17 17:52:49 2015 +++ src/sys/external/bsd/drm2/drm/drm_drv.c Wed Jan 3 20:46:43 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_drv.c,v 1.9.2.4 2015/03/17 17:52:49 riz Exp $ */ +/* $NetBSD: drm_drv.c,v 1.9.2.4.2.1 2018/01/03 20:46:43 snj Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.9.2.4 2015/03/17 17:52:49 riz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.9.2.4.2.1 2018/01/03 20:46:43 snj Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -578,7 +578,7 @@ drm_stat(struct file *fp, struct stat *s struct drm_file *const file = fp->f_data; struct drm_minor *const dminor = file->minor; const dev_t devno = makedev(cdevsw_lookup_major(&drm_cdevsw), - 64*dminor->index + dminor->type); + 64*dminor->type + dminor->index); (void)memset(st, 0, sizeof(*st));