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 Stub SYS_RESTART for reboot notificati...



details:   https://anonhg.NetBSD.org/src/rev/c318b4c6311d
branches:  trunk
changeset: 835255:c318b4c6311d
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 13:41:23 2018 +0000

description:
Stub SYS_RESTART for reboot notifications so we can remove panic("XXX").

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_dp.c |  8 ++------
 sys/external/bsd/drm2/include/linux/reboot.h   |  4 +++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diffs (54 lines):

diff -r 3ce6f37aadc7 -r c318b4c6311d sys/external/bsd/drm2/dist/drm/i915/intel_dp.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c    Mon Aug 27 13:41:08 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c    Mon Aug 27 13:41:23 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_dp.c,v 1.16 2018/08/27 07:25:43 riastradh Exp $  */
+/*     $NetBSD: intel_dp.c,v 1.17 2018/08/27 13:41:23 riastradh Exp $  */
 
 /*
  * Copyright © 2008 Intel Corporation
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_dp.c,v 1.16 2018/08/27 07:25:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_dp.c,v 1.17 2018/08/27 13:41:23 riastradh Exp $");
 
 #include <linux/i2c.h>
 #include <linux/slab.h>
@@ -580,9 +580,6 @@
 static int edp_notify_handler(struct notifier_block *this, unsigned long code,
                              void *unused)
 {
-#ifdef __NetBSD__
-       panic("XXX");
-#else
        struct intel_dp *intel_dp = container_of(this, typeof(* intel_dp),
                                                 edp_notifier);
        struct drm_device *dev = intel_dp_to_dev(intel_dp);
@@ -612,7 +609,6 @@
        pps_unlock(intel_dp);
 
        return 0;
-#endif
 }
 
 static bool edp_have_panel_power(struct intel_dp *intel_dp)
diff -r 3ce6f37aadc7 -r c318b4c6311d sys/external/bsd/drm2/include/linux/reboot.h
--- a/sys/external/bsd/drm2/include/linux/reboot.h      Mon Aug 27 13:41:08 2018 +0000
+++ b/sys/external/bsd/drm2/include/linux/reboot.h      Mon Aug 27 13:41:23 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: reboot.h,v 1.4 2018/08/27 07:30:47 riastradh Exp $     */
+/*     $NetBSD: reboot.h,v 1.5 2018/08/27 13:41:24 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -37,6 +37,8 @@
 
 struct notifier_block;
 
+#define        SYS_RESTART     0
+
 /* XXX Implement this by posting a CRITICAL-OVER envsys event?  */
 static inline int
 orderly_poweroff(bool force __unused)



Home | Main Index | Thread Index | Old Index