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, nbsd-n...



details:   https://anonhg.NetBSD.org/src/rev/000b515a7f96
branches:  trunk
changeset: 1028175:000b515a7f96
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 09:45:25 2021 +0000

description:
ifdef out sysfs stuff, nbsd-namespace


Author: Maya Rashish <maya%NetBSD.org@localhost>

diffstat:

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

diffs (47 lines):

diff -r 3fd97276b19b -r 000b515a7f96 sys/external/bsd/drm2/dist/drm/drm_drv.c
--- a/sys/external/bsd/drm2/dist/drm/drm_drv.c  Sun Dec 19 09:45:18 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_drv.c  Sun Dec 19 09:45:25 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_drv.c,v 1.18 2021/12/19 09:45:18 riastradh Exp $   */
+/*     $NetBSD: drm_drv.c,v 1.19 2021/12/19 09:45:25 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.18 2021/12/19 09:45:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.19 2021/12/19 09:45:25 riastradh Exp $");
 
 #include <linux/debugfs.h>
 #include <linux/fs.h>
@@ -51,6 +51,8 @@
 #include "drm_internal.h"
 #include "drm_legacy.h"
 
+#include <linux/nbsd-namespace.h>
+
 MODULE_AUTHOR("Gareth Hughes, Leif Delgass, José Fonseca, Jon Smirl");
 MODULE_DESCRIPTION("DRM shared core routines");
 MODULE_LICENSE("GPL and additional rights");
@@ -752,7 +754,9 @@
        sysmon_pswitch_unregister(&dev->sc_monitor_hotplug);
 err_pswitch:
 #endif
+#ifndef __NetBSD__             /* XXX drm sysfs */
        put_device(dev->dev);
+#endif
        mutex_destroy(&dev->master_mutex);
        mutex_destroy(&dev->clientlist_mutex);
        mutex_destroy(&dev->filelist_mutex);
@@ -831,7 +835,9 @@
        sysmon_pswitch_unregister(&dev->sc_monitor_hotplug);
 #endif
 
+#ifndef __NetBSD__             /* XXX drm sysfs */
        put_device(dev->dev);
+#endif
 
        mutex_destroy(&dev->master_mutex);
        mutex_destroy(&dev->clientlist_mutex);



Home | Main Index | Thread Index | Old Index