[src/trunk]: src/sys/arch unifdef -U_LKM

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

details:   https://anonhg.NetBSD.org/src/rev/d4f0d5642a1a
branches:  trunk
changeset: 1012140:d4f0d5642a1a
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Jul 23 19:22:13 2020 +0000

description:
unifdef -U_LKM

diffstat:

 sys/arch/alpha/include/pmap.h  |   4 +---
 sys/arch/epoc32/include/intr.h |  12 +-----------
 sys/arch/iyonix/include/intr.h |  12 +-----------
 sys/arch/mips/include/locore.h |   8 ++++----
 sys/arch/zaurus/include/intr.h |  12 +-----------
 5 files changed, 8 insertions(+), 40 deletions(-)

diffs (158 lines):

diff -r f00287be861e -r d4f0d5642a1a sys/arch/alpha/include/pmap.h
--- a/sys/arch/alpha/include/pmap.h     Thu Jul 23 19:20:02 2020 +0000
+++ b/sys/arch/alpha/include/pmap.h     Thu Jul 23 19:22:13 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.81 2020/03/14 14:05:42 ad Exp $ */
+/* $NetBSD: pmap.h,v 1.82 2020/07/23 19:23:27 skrll Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001, 2007 The NetBSD Foundation, Inc.
@@ -188,7 +188,6 @@
 #define        _PMAP_MAY_USE_PROM_CONSOLE
 #endif
 
-#ifndef _LKM
 #if defined(MULTIPROCESSOR)
 struct cpu_info;
 struct trapframe;
@@ -206,7 +205,6 @@
 #define        PMAP_TLB_SHOOTDOWN(pm, va, pte)         /* nothing */
 #define        PMAP_TLB_SHOOTNOW()                     /* nothing */
 #endif /* MULTIPROCESSOR */
-#endif /* _LKM */
 
 #define        pmap_resident_count(pmap)       ((pmap)->pm_stats.resident_count)
 #define        pmap_wired_count(pmap)          ((pmap)->pm_stats.wired_count)
diff -r f00287be861e -r d4f0d5642a1a sys/arch/epoc32/include/intr.h
--- a/sys/arch/epoc32/include/intr.h    Thu Jul 23 19:20:02 2020 +0000
+++ b/sys/arch/epoc32/include/intr.h    Thu Jul 23 19:22:13 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.1 2013/04/28 12:11:26 kiyohara Exp $        */
+/*     $NetBSD: intr.h,v 1.2 2020/07/23 19:25:14 skrll Exp $   */
 
 /*
  * Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -66,21 +66,11 @@
 
 #include <sys/queue.h>
 
-#if defined(_LKM)
-
-int    _splraise(int);
-int    _spllower(int);
-void   splx(int);
-
-#else  /* _LKM */
-
 #define PIC_MAXSOURCES         16
 #define PIC_MAXMAXSOURCES      16
 
 #include <arm/pic/picvar.h>
 
-#endif /* _LKM */
-
 #define        splsoft()       _splraise(IPL_SOFT)
 
 typedef uint8_t ipl_t;
diff -r f00287be861e -r d4f0d5642a1a sys/arch/iyonix/include/intr.h
--- a/sys/arch/iyonix/include/intr.h    Thu Jul 23 19:20:02 2020 +0000
+++ b/sys/arch/iyonix/include/intr.h    Thu Jul 23 19:22:13 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.10 2012/06/10 13:15:24 skrll Exp $  */
+/*     $NetBSD: intr.h,v 1.11 2020/07/23 19:23:49 skrll Exp $  */
 
 /*
  * Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -66,14 +66,6 @@
 
 #ifndef _LOCORE
 
-#if defined(_LKM)
-
-int    _splraise(int);
-int    _spllower(int);
-void   splx(int);
-
-#else  /* _LKM */
-
 #include "opt_arm_intr_impl.h"
 
 #if defined(ARM_INTR_IMPL)
@@ -118,8 +110,6 @@
 
 #endif /* ARM_INTR_IMPL */
 
-#endif /* _LKM */
-
 typedef uint8_t ipl_t;
 typedef struct {
        ipl_t _ipl;
diff -r f00287be861e -r d4f0d5642a1a sys/arch/mips/include/locore.h
--- a/sys/arch/mips/include/locore.h    Thu Jul 23 19:20:02 2020 +0000
+++ b/sys/arch/mips/include/locore.h    Thu Jul 23 19:22:13 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.108 2020/07/23 19:20:02 skrll Exp $ */
+/* $NetBSD: locore.h,v 1.109 2020/07/23 19:22:13 skrll Exp $ */
 
 /*
  * This file should not be included by MI code!!!
@@ -28,7 +28,7 @@
 #ifndef _MIPS_LOCORE_H
 #define _MIPS_LOCORE_H
 
-#if !defined(_LKM) && defined(_KERNEL_OPT)
+#if defined(_KERNEL_OPT)
 #include "opt_cputype.h"
 #endif
 
@@ -51,7 +51,7 @@
 
 #ifdef _KERNEL
 
-#if defined(_MODULAR) || defined(_LKM) || defined(_STANDALONE)
+#if defined(_MODULAR) || defined(_STANDALONE)
 /* Assume all CPU architectures are valid for LKM's and standlone progs */
 #if !defined(__mips_n32) && !defined(__mips_n64)
 #define        MIPS1           1
@@ -64,7 +64,7 @@
 #endif
 #define        MIPS64          1
 #define        MIPS64R2        1
-#endif /* _MODULAR || _LKM || _STANDALONE */
+#endif /* _MODULAR || _STANDALONE */
 
 #if (MIPS1 + MIPS3 + MIPS4 + MIPS32 + MIPS32R2 + MIPS64 + MIPS64R2) == 0
 #error at least one of MIPS1, MIPS3, MIPS4, MIPS32, MIPS32R2, MIPS64, or MIPS64R2 must be specified
diff -r f00287be861e -r d4f0d5642a1a sys/arch/zaurus/include/intr.h
--- a/sys/arch/zaurus/include/intr.h    Thu Jul 23 19:20:02 2020 +0000
+++ b/sys/arch/zaurus/include/intr.h    Thu Jul 23 19:22:13 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.9 2014/07/27 08:55:39 skrll Exp $   */
+/*     $NetBSD: intr.h,v 1.10 2020/07/23 19:24:38 skrll Exp $  */
 
 /*
  * Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -68,14 +68,6 @@
 
 #include <sys/queue.h>
 
-#if defined(_LKM)
-
-int    _splraise(int);
-int    _spllower(int);
-void   splx(int);
-
-#else  /* _LKM */
-
 #include "opt_arm_intr_impl.h"
 
 #if defined(ARM_INTR_IMPL)
@@ -119,8 +111,6 @@
 
 #endif /* ARM_INTR_IMPL */
 
-#endif /* _LKM */
-
 #define        splsoft()       _splraise(IPL_SOFT)
 
 typedef uint8_t ipl_t;