Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm Ifdef out sysfs stuff.



details:   https://anonhg.NetBSD.org/src/rev/fd95ecb09694
branches:  trunk
changeset: 992821:fd95ecb09694
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:54:18 2018 +0000

description:
Ifdef out sysfs stuff.

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_drv.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r 354b89dafaf7 -r fd95ecb09694 sys/external/bsd/drm2/dist/drm/drm_drv.c
--- a/sys/external/bsd/drm2/dist/drm/drm_drv.c  Mon Aug 27 07:54:07 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_drv.c  Mon Aug 27 07:54:18 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_drv.c,v 1.5 2018/08/27 06:54:08 riastradh Exp $    */
+/*     $NetBSD: drm_drv.c,v 1.6 2018/08/27 07:54:18 riastradh Exp $    */
 
 /*
  * Created: Fri Jan 19 10:48:35 2001 by faith%acm.org@localhost
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.5 2018/08/27 06:54:08 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.6 2018/08/27 07:54:18 riastradh Exp $");
 
 #include <linux/err.h>
 #include <linux/export.h>
@@ -302,16 +302,18 @@
 
        minor->index = r;
 
+#ifndef __NetBSD__             /* XXX drm sysfs */
        minor->kdev = drm_sysfs_minor_alloc(minor);
        if (IS_ERR(minor->kdev)) {
                r = PTR_ERR(minor->kdev);
                goto err_index;
        }
+#endif
 
        *drm_minor_get_slot(dev, type) = minor;
        return 0;
 
-err_index:
+err_index: __unused
        spin_lock_irqsave(&drm_minor_lock, flags);
        idr_remove(&drm_minors_idr, minor->index);
        spin_unlock_irqrestore(&drm_minor_lock, flags);
@@ -330,7 +332,7 @@
        if (!minor)
                return;
 
-#ifndef __NetBSD__
+#ifndef __NetBSD__             /* XXX drm sysfs */
        put_device(minor->kdev);
 #endif
 



Home | Main Index | Thread Index | Old Index