Module Name: src
Committed By: mrg
Date: Wed Dec 31 08:55:18 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/drm: drm_vm.c
Log Message:
fix a confusion between dev_t and devmajor_t, and include the primary
minor when calling makedev().
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/drm/drm_vm.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_vm.c
diff -u src/sys/external/bsd/drm2/drm/drm_vm.c:1.6 src/sys/external/bsd/drm2/drm/drm_vm.c:1.7
--- src/sys/external/bsd/drm2/drm/drm_vm.c:1.6 Sun Dec 14 23:48:58 2014
+++ src/sys/external/bsd/drm2/drm/drm_vm.c Wed Dec 31 08:55:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_vm.c,v 1.6 2014/12/14 23:48:58 chs Exp $ */
+/* $NetBSD: drm_vm.c,v 1.7 2014/12/31 08:55:18 mrg Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_vm.c,v 1.6 2014/12/14 23:48:58 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_vm.c,v 1.7 2014/12/31 08:55:18 mrg Exp $");
#include <sys/types.h>
#include <sys/conf.h>
@@ -49,7 +49,8 @@ int
drm_mmap_object(struct drm_device *dev, off_t offset, size_t size, int prot,
struct uvm_object **uobjp, voff_t *uoffsetp, struct file *file __unused)
{
- dev_t devno = cdevsw_lookup_major(&drm_cdevsw);
+ devmajor_t maj = cdevsw_lookup_major(&drm_cdevsw);
+ dev_t devno = makedev(maj, dev->primary->index);
struct uvm_object *uobj;
KASSERT(offset == (offset & ~(PAGE_SIZE-1)));
