Module Name: src
Committed By: riastradh
Date: Sun Sep 8 16:32:37 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/include/linux [riastradh-drm2]: device.h
kernel.h notifier.h printk.h sysrq.h
Log Message:
Miscellaneous Linux header file crud.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 \
src/sys/external/bsd/drm2/include/linux/device.h
cvs rdiff -u -r1.1.2.21 -r1.1.2.22 \
src/sys/external/bsd/drm2/include/linux/kernel.h
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 \
src/sys/external/bsd/drm2/include/linux/notifier.h \
src/sys/external/bsd/drm2/include/linux/sysrq.h
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 \
src/sys/external/bsd/drm2/include/linux/printk.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/include/linux/device.h
diff -u src/sys/external/bsd/drm2/include/linux/device.h:1.1.2.4 src/sys/external/bsd/drm2/include/linux/device.h:1.1.2.5
--- src/sys/external/bsd/drm2/include/linux/device.h:1.1.2.4 Wed Jul 24 03:26:18 2013
+++ src/sys/external/bsd/drm2/include/linux/device.h Sun Sep 8 16:32:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.1.2.4 2013/07/24 03:26:18 riastradh Exp $ */
+/* $NetBSD: device.h,v 1.1.2.5 2013/09/08 16:32:37 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -38,6 +38,9 @@
#define dev_err(DEV, FMT, ...) \
device_printf((DEV), "error: " FMT, ##__VA_ARGS__)
+#define dev_info(DEV, FMT, ...) \
+ device_printf((DEV), "info: " FMT, ##__VA_ARGS__)
+
#define dev_warn(DEV, FMT, ...) \
device_printf((DEV), "warning: " FMT, ##__VA_ARGS__)
Index: src/sys/external/bsd/drm2/include/linux/kernel.h
diff -u src/sys/external/bsd/drm2/include/linux/kernel.h:1.1.2.21 src/sys/external/bsd/drm2/include/linux/kernel.h:1.1.2.22
--- src/sys/external/bsd/drm2/include/linux/kernel.h:1.1.2.21 Sun Sep 8 15:58:24 2013
+++ src/sys/external/bsd/drm2/include/linux/kernel.h Sun Sep 8 16:32:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kernel.h,v 1.1.2.21 2013/09/08 15:58:24 riastradh Exp $ */
+/* $NetBSD: kernel.h,v 1.1.2.22 2013/09/08 16:32:37 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -109,4 +109,6 @@ abs64(int64_t x)
return (x < 0? (-x) : x);
}
+static int panic_timeout __unused = 0;
+
#endif /* _LINUX_KERNEL_H_ */
Index: src/sys/external/bsd/drm2/include/linux/notifier.h
diff -u src/sys/external/bsd/drm2/include/linux/notifier.h:1.1.2.1 src/sys/external/bsd/drm2/include/linux/notifier.h:1.1.2.2
--- src/sys/external/bsd/drm2/include/linux/notifier.h:1.1.2.1 Wed Jul 24 03:49:42 2013
+++ src/sys/external/bsd/drm2/include/linux/notifier.h Sun Sep 8 16:32:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: notifier.h,v 1.1.2.1 2013/07/24 03:49:42 riastradh Exp $ */
+/* $NetBSD: notifier.h,v 1.1.2.2 2013/09/08 16:32:37 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -32,11 +32,31 @@
#ifndef _LINUX_NOTIFIER_H_
#define _LINUX_NOTIFIER_H_
+#include <sys/cdefs.h>
+
+#define NOTIFY_OK 0
+
struct notifier_block {
int (*notifier_call)(struct notifier_block *, unsigned long,
void *);
};
-#define NOTIFY_OK 0
+struct atomic_notifier_head {
+ char anh_blahdittyblahblah;
+};
+
+static struct atomic_notifier_head panic_notifier_list __unused;
+
+static inline void
+atomic_notifier_chain_register(struct atomic_notifier_head *head __unused,
+ struct notifier_block *block __unused)
+{
+}
+
+static inline void
+atomic_notifier_chain_unregister(struct atomic_notifier_head *head __unused,
+ struct notifier_block *block __unused)
+{
+}
#endif /* _LINUX_NOTIFIER_H_ */
Index: src/sys/external/bsd/drm2/include/linux/sysrq.h
diff -u src/sys/external/bsd/drm2/include/linux/sysrq.h:1.1.2.1 src/sys/external/bsd/drm2/include/linux/sysrq.h:1.1.2.2
--- src/sys/external/bsd/drm2/include/linux/sysrq.h:1.1.2.1 Wed Jul 24 00:33:12 2013
+++ src/sys/external/bsd/drm2/include/linux/sysrq.h Sun Sep 8 16:32:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sysrq.h,v 1.1.2.1 2013/07/24 00:33:12 riastradh Exp $ */
+/* $NetBSD: sysrq.h,v 1.1.2.2 2013/09/08 16:32:37 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -32,4 +32,18 @@
#ifndef _LINUX_SYSRQ_H_
#define _LINUX_SYSRQ_H_
+struct sysrq_key_op {
+ char sko_blahdittyblahblah;
+};
+
+static inline void
+register_sysrq_key(char key __unused, struct sysrq_key_op *op __unused)
+{
+}
+
+static inline void
+unregister_sysrq_key(char key __unused, struct sysrq_key_op *op __unused)
+{
+}
+
#endif /* _LINUX_SYSRQ_H_ */
Index: src/sys/external/bsd/drm2/include/linux/printk.h
diff -u src/sys/external/bsd/drm2/include/linux/printk.h:1.1.2.5 src/sys/external/bsd/drm2/include/linux/printk.h:1.1.2.6
--- src/sys/external/bsd/drm2/include/linux/printk.h:1.1.2.5 Wed Jul 24 03:50:45 2013
+++ src/sys/external/bsd/drm2/include/linux/printk.h Sun Sep 8 16:32:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: printk.h,v 1.1.2.5 2013/07/24 03:50:45 riastradh Exp $ */
+/* $NetBSD: printk.h,v 1.1.2.6 2013/09/08 16:32:37 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -38,6 +38,7 @@
#define printk printf
#define vprintk vprintf
#define pr_err printf /* XXX */
+#define pr_info printf /* XXX */
#define pr_warn_once printf /* XXX */
#define KERN_DEBUG "drm kern debug: "
#define KERN_WARNING "drm kern warning: "
