Module Name: src
Committed By: skrll
Date: Mon Jul 27 12:32:54 UTC 2020
Modified Files:
src/sys/arch/hpcarm/include: intr.h
src/sys/arch/iyonix/include: intr.h
src/sys/arch/zaurus/include: intr.h
Log Message:
Don't remove the _LKM #ifdefs, but do s/_LKM/_MODULE/
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hpcarm/include/intr.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/iyonix/include/intr.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/zaurus/include/intr.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/arch/hpcarm/include/intr.h
diff -u src/sys/arch/hpcarm/include/intr.h:1.20 src/sys/arch/hpcarm/include/intr.h:1.21
--- src/sys/arch/hpcarm/include/intr.h:1.20 Thu Jul 23 19:04:03 2020
+++ src/sys/arch/hpcarm/include/intr.h Mon Jul 27 12:32:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.20 2020/07/23 19:04:03 skrll Exp $ */
+/* $NetBSD: intr.h,v 1.21 2020/07/27 12:32:54 skrll Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -72,6 +72,14 @@
#include <sys/queue.h>
+#if defined(_MODULE)
+
+int _splraise(int);
+int _spllower(int);
+void splx(int);
+
+#else /* _MODULE */
+
#include "opt_arm_intr_impl.h"
#if defined(ARM_INTR_IMPL)
@@ -118,6 +126,8 @@
#define splsoft() _splraise(IPL_SOFT)
+#endif /* _MODULE */
+
typedef uint8_t ipl_t;
typedef struct {
ipl_t _ipl;
Index: src/sys/arch/iyonix/include/intr.h
diff -u src/sys/arch/iyonix/include/intr.h:1.11 src/sys/arch/iyonix/include/intr.h:1.12
--- src/sys/arch/iyonix/include/intr.h:1.11 Thu Jul 23 19:23:49 2020
+++ src/sys/arch/iyonix/include/intr.h Mon Jul 27 12:32:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.11 2020/07/23 19:23:49 skrll Exp $ */
+/* $NetBSD: intr.h,v 1.12 2020/07/27 12:32:54 skrll Exp $ */
/*
* Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -66,6 +66,14 @@
#ifndef _LOCORE
+#if defined(_MODULE)
+
+int _splraise(int);
+int _spllower(int);
+void splx(int);
+
+#else /* _MODULE */
+
#include "opt_arm_intr_impl.h"
#if defined(ARM_INTR_IMPL)
@@ -110,6 +118,8 @@
#endif /* ARM_INTR_IMPL */
+#endif /* _MODULE */
+
typedef uint8_t ipl_t;
typedef struct {
ipl_t _ipl;
Index: src/sys/arch/zaurus/include/intr.h
diff -u src/sys/arch/zaurus/include/intr.h:1.10 src/sys/arch/zaurus/include/intr.h:1.11
--- src/sys/arch/zaurus/include/intr.h:1.10 Thu Jul 23 19:24:38 2020
+++ src/sys/arch/zaurus/include/intr.h Mon Jul 27 12:32:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.10 2020/07/23 19:24:38 skrll Exp $ */
+/* $NetBSD: intr.h,v 1.11 2020/07/27 12:32:54 skrll Exp $ */
/*
* Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -68,6 +68,14 @@
#include <sys/queue.h>
+#if defined(_MODULE)
+
+int _splraise(int);
+int _spllower(int);
+void splx(int);
+
+#else /* _MODULE */
+
#include "opt_arm_intr_impl.h"
#if defined(ARM_INTR_IMPL)
@@ -113,6 +121,8 @@
#define splsoft() _splraise(IPL_SOFT)
+#endif /* _MODULE */
+
typedef uint8_t ipl_t;
typedef struct {
ipl_t _ipl;
