Module Name: src
Committed By: riastradh
Date: Mon Aug 27 13:41:24 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_dp.c
src/sys/external/bsd/drm2/include/linux: reboot.h
Log Message:
Stub SYS_RESTART for reboot notifications so we can remove panic("XXX").
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/include/linux/reboot.h
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/dist/drm/i915/intel_dp.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c:1.16 src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c:1.17
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c:1.16 Mon Aug 27 07:25:43 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c Mon Aug 27 13:41:23 2018
@@ -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 u32 _pp_stat_reg(struct intel_dp
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 @@ static int edp_notify_handler(struct not
pps_unlock(intel_dp);
return 0;
-#endif
}
static bool edp_have_panel_power(struct intel_dp *intel_dp)
Index: src/sys/external/bsd/drm2/include/linux/reboot.h
diff -u src/sys/external/bsd/drm2/include/linux/reboot.h:1.4 src/sys/external/bsd/drm2/include/linux/reboot.h:1.5
--- src/sys/external/bsd/drm2/include/linux/reboot.h:1.4 Mon Aug 27 07:30:47 2018
+++ src/sys/external/bsd/drm2/include/linux/reboot.h Mon Aug 27 13:41:24 2018
@@ -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)
