Module Name: src
Committed By: rin
Date: Mon Aug 10 10:59:34 UTC 2020
Modified Files:
src/sys/arch/amiga/include: intr.h
src/sys/arch/hpc/stand/libsa: compat.h
src/sys/arch/hpcmips/stand/libsa: compat.h
src/sys/arch/i386/bioscall: Makefile
src/sys/arch/i386/include: byte_swap.h
src/sys/arch/mac68k/obio: iwm_fdvar.h
src/sys/arch/sun2/include: vmparam.h
src/sys/arch/sun3/sun3: genassym.cf
src/sys/dist/pf/net: pf.c
src/sys/secmodel/keylock: keylock.h
Log Message:
Clean up _LKM --> _MODULE leftovers.
Note that _KERNEL is always defined for modules.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/amiga/include/intr.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hpc/stand/libsa/compat.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hpcmips/stand/libsa/compat.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/i386/bioscall/Makefile
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/i386/include/byte_swap.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mac68k/obio/iwm_fdvar.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sun2/include/vmparam.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sun3/sun3/genassym.cf
cvs rdiff -u -r1.83 -r1.84 src/sys/dist/pf/net/pf.c
cvs rdiff -u -r1.1 -r1.2 src/sys/secmodel/keylock/keylock.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/amiga/include/intr.h
diff -u src/sys/arch/amiga/include/intr.h:1.21 src/sys/arch/amiga/include/intr.h:1.22
--- src/sys/arch/amiga/include/intr.h:1.21 Tue May 19 18:39:27 2009
+++ src/sys/arch/amiga/include/intr.h Mon Aug 10 10:59:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.21 2009/05/19 18:39:27 phx Exp $ */
+/* $NetBSD: intr.h,v 1.22 2020/08/10 10:59:33 rin Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -83,7 +83,7 @@ splraiseipl(ipl_cookie_t icookie)
#define splsoftbio() splraise1()
#define splvm() splraise4()
-#ifndef _LKM
+#ifndef _MODULE
#ifndef LEV6_DEFER
#define splsched() splraise6()
@@ -93,7 +93,7 @@ splraiseipl(ipl_cookie_t icookie)
#define splhigh() splraise4()
#endif
-#else /* _LKM */
+#else /* _MODULE */
extern int _spllkm6(void);
extern int _spllkm7(void);
@@ -101,7 +101,7 @@ extern int _spllkm7(void);
#define splsched() _spllkm6()
#define splhigh() _spllkm7()
-#endif /* _LKM */
+#endif /* _MODULE */
#define splx(s) _spl(s)
Index: src/sys/arch/hpc/stand/libsa/compat.h
diff -u src/sys/arch/hpc/stand/libsa/compat.h:1.3 src/sys/arch/hpc/stand/libsa/compat.h:1.4
--- src/sys/arch/hpc/stand/libsa/compat.h:1.3 Sun Dec 11 12:17:30 2005
+++ src/sys/arch/hpc/stand/libsa/compat.h Mon Aug 10 10:59:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.h,v 1.3 2005/12/11 12:17:30 christos Exp $ */
+/* $NetBSD: compat.h,v 1.4 2020/08/10 10:59:33 rin Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura.
@@ -37,7 +37,7 @@
*/
#define __lint__
#define __symbolrename(x)
-#define _LKM
+#define _MODULE
#define _STANDALONE
#define __STDC__
#define NO_LONG_LONG
Index: src/sys/arch/hpcmips/stand/libsa/compat.h
diff -u src/sys/arch/hpcmips/stand/libsa/compat.h:1.2 src/sys/arch/hpcmips/stand/libsa/compat.h:1.3
--- src/sys/arch/hpcmips/stand/libsa/compat.h:1.2 Sun Jan 16 03:07:24 2000
+++ src/sys/arch/hpcmips/stand/libsa/compat.h Mon Aug 10 10:59:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.h,v 1.2 2000/01/16 03:07:24 takemura Exp $ */
+/* $NetBSD: compat.h,v 1.3 2020/08/10 10:59:33 rin Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura.
@@ -37,7 +37,7 @@
*/
#define __lint__
#define __symbolrename(x)
-#define _LKM
+#define _MODULE
#define _STANDALONE
#define __STDC__
#define NO_LONG_LONG
Index: src/sys/arch/i386/bioscall/Makefile
diff -u src/sys/arch/i386/bioscall/Makefile:1.20 src/sys/arch/i386/bioscall/Makefile:1.21
--- src/sys/arch/i386/bioscall/Makefile:1.20 Tue Mar 4 14:58:14 2014
+++ src/sys/arch/i386/bioscall/Makefile Mon Aug 10 10:59:33 2020
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.20 2014/03/04 14:58:14 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2020/08/10 10:59:33 rin Exp $
CPPFLAGS= ${APMCPPFLAGS}
KSRC=${.CURDIR}/../../..
ARCHSRC=${.CURDIR}/../..
I386=${KSRC}/arch/i386
X86=${KSRC}/arch/x86
-CPPFLAGS+=-I${ARCHSRC} -I${KSRC} -I${.CURDIR} -I${.OBJDIR} -D_LKM -D_KERNEL
+CPPFLAGS+=-I${ARCHSRC} -I${KSRC} -I${.CURDIR} -I${.OBJDIR} -D_MODULE -D_KERNEL
SRCS= biostramp.S
OBJS= biostramp.o
Index: src/sys/arch/i386/include/byte_swap.h
diff -u src/sys/arch/i386/include/byte_swap.h:1.16 src/sys/arch/i386/include/byte_swap.h:1.17
--- src/sys/arch/i386/include/byte_swap.h:1.16 Thu Jul 23 19:21:23 2020
+++ src/sys/arch/i386/include/byte_swap.h Mon Aug 10 10:59:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: byte_swap.h,v 1.16 2020/07/23 19:21:23 skrll Exp $ */
+/* $NetBSD: byte_swap.h,v 1.17 2020/08/10 10:59:33 rin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@ __byte_swap_u16_variable(uint16_t x)
}
__END_DECLS
-#elif defined(_KERNEL) || defined(_LKM)
+#elif defined(_KERNEL)
#define __BYTE_SWAP_U32_VARIABLE __byte_swap_u32_variable
#define __BYTE_SWAP_U16_VARIABLE __byte_swap_u16_variable
uint32_t __byte_swap_u32_variable(uint32_t);
Index: src/sys/arch/mac68k/obio/iwm_fdvar.h
diff -u src/sys/arch/mac68k/obio/iwm_fdvar.h:1.15 src/sys/arch/mac68k/obio/iwm_fdvar.h:1.16
--- src/sys/arch/mac68k/obio/iwm_fdvar.h:1.15 Sat Oct 27 17:18:00 2012
+++ src/sys/arch/mac68k/obio/iwm_fdvar.h Mon Aug 10 10:59:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: iwm_fdvar.h,v 1.15 2012/10/27 17:18:00 chs Exp $ */
+/* $NetBSD: iwm_fdvar.h,v 1.16 2020/08/10 10:59:33 rin Exp $ */
/*
* Copyright (c) 1997, 1998 Hauke Fath. All rights reserved.
@@ -195,7 +195,7 @@ typedef struct iwm_softc iwm_softc_t;
/*
* IWM Loadable Kernel Module : Exported functions
*/
-#ifdef _LKM
+#ifdef _MODULE
int fdModInit(void);
void fdModFree(void);
#endif
Index: src/sys/arch/sun2/include/vmparam.h
diff -u src/sys/arch/sun2/include/vmparam.h:1.15 src/sys/arch/sun2/include/vmparam.h:1.16
--- src/sys/arch/sun2/include/vmparam.h:1.15 Mon Jan 7 16:58:08 2013
+++ src/sys/arch/sun2/include/vmparam.h Mon Aug 10 10:59:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.15 2013/01/07 16:58:08 chs Exp $ */
+/* $NetBSD: vmparam.h,v 1.16 2020/08/10 10:59:33 rin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -107,10 +107,10 @@
#define VM_NFREELIST 1
#define VM_FREELIST_DEFAULT 0
-#ifdef _LKM
+#ifdef _MODULE
#undef KERNBASE
extern char KERNBASE[];
-#endif /* _LKM */
+#endif /* _MODULE */
/* This is needed by some LKMs. */
#define VM_PHYSSEG_MAX 4
Index: src/sys/arch/sun3/sun3/genassym.cf
diff -u src/sys/arch/sun3/sun3/genassym.cf:1.18 src/sys/arch/sun3/sun3/genassym.cf:1.19
--- src/sys/arch/sun3/sun3/genassym.cf:1.18 Thu Feb 20 08:27:39 2020
+++ src/sys/arch/sun3/sun3/genassym.cf Mon Aug 10 10:59:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.18 2020/02/20 08:27:39 skrll Exp $
+# $NetBSD: genassym.cf,v 1.19 2020/08/10 10:59:34 rin Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -104,7 +104,7 @@ define FC_SUPERD FC_SUPERD
define FC_USERD FC_USERD
define IC_CLEAR IC_CLEAR
-ifndef _LKM
+ifndef _MODULE
# bus error stuff
define BUSERR_REG BUSERR_REG
define BUSERR_MMU BUSERR_MMU
@@ -155,7 +155,7 @@ define P_VMSPACE offsetof(struct proc,
# XXX: HP-UX trace bit?
-ifndef _LKM
+ifndef _MODULE
# VM/pmap structure fields
define VM_PMAP offsetof(struct vmspace, vm_map.pmap)
define PM_CTXNUM offsetof(struct pmap, pm_ctxnum)
Index: src/sys/dist/pf/net/pf.c
diff -u src/sys/dist/pf/net/pf.c:1.83 src/sys/dist/pf/net/pf.c:1.84
--- src/sys/dist/pf/net/pf.c:1.83 Mon Sep 3 16:29:34 2018
+++ src/sys/dist/pf/net/pf.c Mon Aug 10 10:59:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pf.c,v 1.83 2018/09/03 16:29:34 riastradh Exp $ */
+/* $NetBSD: pf.c,v 1.84 2020/08/10 10:59:34 rin Exp $ */
/* $OpenBSD: pf.c,v 1.552.2.1 2007/11/27 16:37:57 henning Exp $ */
/*
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pf.c,v 1.83 2018/09/03 16:29:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf.c,v 1.84 2020/08/10 10:59:34 rin Exp $");
#include "pflog.h"
@@ -923,7 +923,7 @@ pf_insert_state(struct pfi_kif *kif, str
return (0);
}
-#ifdef _LKM
+#ifdef _MODULE
volatile int pf_purge_thread_stop;
volatile int pf_purge_thread_running;
#endif
@@ -933,14 +933,14 @@ pf_purge_thread(void *v)
{
int nloops = 0, s;
-#ifdef _LKM
+#ifdef _MODULE
pf_purge_thread_running = 1;
pf_purge_thread_stop = 0;
while (!pf_purge_thread_stop) {
#else
for (;;) {
-#endif /* !_LKM */
+#endif /* !_MODULE */
tsleep(pf_purge_thread, PWAIT, "pftm", 1 * hz);
s = splsoftnet();
@@ -960,11 +960,11 @@ pf_purge_thread(void *v)
splx(s);
}
-#ifdef _LKM
+#ifdef _MODULE
pf_purge_thread_running = 0;
wakeup(&pf_purge_thread_running);
kthread_exit(0);
-#endif /* _LKM */
+#endif /* _MODULE */
}
u_int32_t
Index: src/sys/secmodel/keylock/keylock.h
diff -u src/sys/secmodel/keylock/keylock.h:1.1 src/sys/secmodel/keylock/keylock.h:1.2
--- src/sys/secmodel/keylock/keylock.h:1.1 Fri Aug 14 21:17:22 2009
+++ src/sys/secmodel/keylock/keylock.h Mon Aug 10 10:59:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: keylock.h,v 1.1 2009/08/14 21:17:22 mbalmer Exp $ */
+/* $NetBSD: keylock.h,v 1.2 2020/08/10 10:59:34 rin Exp $ */
/*-
* Copyright (c) 2009 Marc Balmer <m...@msys.ch>
* All rights reserved.
@@ -33,9 +33,9 @@ void secmodel_keylock_init(void);
void secmodel_keylock_start(void);
void secmodel_keylock_stop(void);
-#if defined(_LKM)
+#if defined(_MODULE)
SYSCTL_SETUP_PROTO(sysctl_security_keylock_setup);
-#endif /* _LKM */
+#endif /* _MODULE */
int secmodel_keylock_system_cb(kauth_cred_t, kauth_action_t, void *,
void *, void *, void *, void *);
