Module Name: src
Committed By: msaitoh
Date: Fri Dec 8 05:43:51 UTC 2017
Modified Files:
src/sys/external/bsd/drm2/drm [netbsd-8]: drm_drv.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #422):
sys/external/bsd/drm2/drm/drm_drv.c: revision 1.20
drm_stat: fix device minor calculation, ok riastradh@
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.10.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.17 src/sys/external/bsd/drm2/drm/drm_drv.c:1.17.10.1
--- src/sys/external/bsd/drm2/drm/drm_drv.c:1.17 Mon Nov 9 22:04:53 2015
+++ src/sys/external/bsd/drm2/drm/drm_drv.c Fri Dec 8 05:43:51 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.17 2015/11/09 22:04:53 jmcneill Exp $ */
+/* $NetBSD: drm_drv.c,v 1.17.10.1 2017/12/08 05:43:51 msaitoh 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.17 2015/11/09 22:04:53 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.17.10.1 2017/12/08 05:43:51 msaitoh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -581,7 +581,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));
