[src/trunk]: src/sys/arch Don't remove the _LKM #ifdefs, but do s/_LKM/_MODULE/

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4ca5aeb91945
branches:  trunk
changeset: 974281:4ca5aeb91945
user:      skrll <skrll%NetBSD.org@localhost>
date:      Mon Jul 27 12:32:54 2020 +0000

description:
Don't remove the _LKM #ifdefs, but do s/_LKM/_MODULE/

diffstat:

 sys/arch/hpcarm/include/intr.h |  12 +++++++++++-
 sys/arch/iyonix/include/intr.h |  12 +++++++++++-
 sys/arch/zaurus/include/intr.h |  12 +++++++++++-
 3 files changed, 33 insertions(+), 3 deletions(-)

diffs (99 lines):

diff -r 38b05abc2a40 -r 4ca5aeb91945 sys/arch/hpcarm/include/intr.h
--- a/sys/arch/hpcarm/include/intr.h    Mon Jul 27 11:12:56 2020 +0000
+++ b/sys/arch/hpcarm/include/intr.h    Mon Jul 27 12:32:54 2020 +0000
@@ -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;
diff -r 38b05abc2a40 -r 4ca5aeb91945 sys/arch/iyonix/include/intr.h
--- a/sys/arch/iyonix/include/intr.h    Mon Jul 27 11:12:56 2020 +0000
+++ b/sys/arch/iyonix/include/intr.h    Mon Jul 27 12:32:54 2020 +0000
@@ -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;
diff -r 38b05abc2a40 -r 4ca5aeb91945 sys/arch/zaurus/include/intr.h
--- a/sys/arch/zaurus/include/intr.h    Mon Jul 27 11:12:56 2020 +0000
+++ b/sys/arch/zaurus/include/intr.h    Mon Jul 27 12:32:54 2020 +0000
@@ -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;