Module Name: src
Committed By: tsutsui
Date: Fri Jan 31 18:49:35 UTC 2014
Modified Files:
src/sys/arch/cesfic/cesfic: locore.s
src/sys/arch/hp300/hp300: locore.s
src/sys/arch/luna68k/luna68k: locore.s
src/sys/arch/mvme68k/mvme68k: locore.s
src/sys/arch/news68k/news68k: locore.s
src/sys/arch/next68k/next68k: locore.s
src/sys/arch/x68k/x68k: locore.s
Log Message:
defined(LKM) -> defined(MODULAR)
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/cesfic/cesfic/locore.s
cvs rdiff -u -r1.166 -r1.167 src/sys/arch/hp300/hp300/locore.s
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/luna68k/luna68k/locore.s
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/mvme68k/mvme68k/locore.s
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/news68k/news68k/locore.s
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/next68k/next68k/locore.s
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/x68k/x68k/locore.s
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/cesfic/cesfic/locore.s
diff -u src/sys/arch/cesfic/cesfic/locore.s:1.28 src/sys/arch/cesfic/cesfic/locore.s:1.29
--- src/sys/arch/cesfic/cesfic/locore.s:1.28 Thu Dec 22 15:33:29 2011
+++ src/sys/arch/cesfic/cesfic/locore.s Fri Jan 31 18:49:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.28 2011/12/22 15:33:29 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.29 2014/01/31 18:49:35 tsutsui Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -247,7 +247,7 @@ Lmemok:
movl %d1,%a0@ | and physmem
/* configure kernel and lwp0 VA space so we can get going */
.globl _Sysseg_pa, _pmap_bootstrap, _avail_start
-#if NKSYMS || defined(DDB) || defined(LKM)
+#if NKSYMS || defined(DDB) || defined(MODULAR)
RELOC(esym,%a0) | end of static kernel test/data/syms
movl %a0@,%d5
jne Lstart2
Index: src/sys/arch/hp300/hp300/locore.s
diff -u src/sys/arch/hp300/hp300/locore.s:1.166 src/sys/arch/hp300/hp300/locore.s:1.167
--- src/sys/arch/hp300/hp300/locore.s:1.166 Fri Aug 16 13:39:47 2013
+++ src/sys/arch/hp300/hp300/locore.s Fri Jan 31 18:49:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.166 2013/08/16 13:39:47 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.167 2014/01/31 18:49:35 tsutsui Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -436,7 +436,7 @@ Lstart2:
movl %d1,%a0@ | and physmem
/* configure kernel and lwp0 VA space so we can get going */
-#if NKSYMS || defined(DDB) || defined(LKM)
+#if NKSYMS || defined(DDB) || defined(MODULAR)
RELOC(esym,%a0) | end of static kernel test/data/syms
movl %a0@,%d5
jne Lstart3
Index: src/sys/arch/luna68k/luna68k/locore.s
diff -u src/sys/arch/luna68k/luna68k/locore.s:1.54 src/sys/arch/luna68k/luna68k/locore.s:1.55
--- src/sys/arch/luna68k/luna68k/locore.s:1.54 Sat Jan 11 08:07:16 2014
+++ src/sys/arch/luna68k/luna68k/locore.s Fri Jan 31 18:49:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.54 2014/01/11 08:07:16 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.55 2014/01/31 18:49:35 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -212,7 +212,7 @@ Lstart2:
movl %d1,%a0@ | and physmem
/* check if symbol table is loaded and set esym address */
-#if NKSYMS || defined(DDB) || defined(LKM)
+#if NKSYMS || defined(DDB) || defined(MODULAR)
RELOC(end,%a0)
pea %a0@
RELOC(_C_LABEL(symtab_size),%a0)
@@ -230,7 +230,7 @@ Lstart2:
movl %d0,%a0@
/* configure kernel and lwp0 VA space so we can get going */
-#if NKSYMS || defined(DDB) || defined(LKM)
+#if NKSYMS || defined(DDB) || defined(MODULAR)
RELOC(esym,%a0) | end of static kernel test/data/syms
movl %a0@,%d2
jne Lstart3
Index: src/sys/arch/mvme68k/mvme68k/locore.s
diff -u src/sys/arch/mvme68k/mvme68k/locore.s:1.110 src/sys/arch/mvme68k/mvme68k/locore.s:1.111
--- src/sys/arch/mvme68k/mvme68k/locore.s:1.110 Thu Dec 22 15:33:29 2011
+++ src/sys/arch/mvme68k/mvme68k/locore.s Fri Jan 31 18:49:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.110 2011/12/22 15:33:29 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.111 2014/01/31 18:49:35 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -552,7 +552,7 @@ Lstart1:
/*
* configure kernel and lwp0 VA space so we can get going
*/
-#if NKSYMS || defined(DDB) || defined(LKM)
+#if NKSYMS || defined(DDB) || defined(MODULAR)
RELOC(esym,%a0) | end of static kernel text/data syms
movl %a0@,%d2
jne Lstart2
Index: src/sys/arch/news68k/news68k/locore.s
diff -u src/sys/arch/news68k/news68k/locore.s:1.62 src/sys/arch/news68k/news68k/locore.s:1.63
--- src/sys/arch/news68k/news68k/locore.s:1.62 Thu Dec 22 15:33:30 2011
+++ src/sys/arch/news68k/news68k/locore.s Fri Jan 31 18:49:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.62 2011/12/22 15:33:30 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.63 2014/01/31 18:49:35 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -151,7 +151,7 @@ ASENTRY_NOPROFILE(start)
movl %a0@(128),_ASM_LABEL(romcallvec)| save trap #0 to use PROM calls
RELOC(esym, %a0)
-#if NKSYMS || defined(DDB) || defined(LKM)
+#if NKSYMS || defined(DDB) || defined(MODULAR)
movl %d2,%a0@ | store end of symbol table
#else
clrl %a0@
@@ -331,7 +331,7 @@ Lstart1:
*/
.globl _Sysseg_pa, _pmap_bootstrap, _avail_start
-#if NKSYMS || defined(DDB) || defined(LKM)
+#if NKSYMS || defined(DDB) || defined(MODULAR)
RELOC(esym,%a0) | end of static kernel test/data/syms
movl %a0@,%d2
jne Lstart2
Index: src/sys/arch/next68k/next68k/locore.s
diff -u src/sys/arch/next68k/next68k/locore.s:1.61 src/sys/arch/next68k/next68k/locore.s:1.62
--- src/sys/arch/next68k/next68k/locore.s:1.61 Thu Dec 22 15:33:30 2011
+++ src/sys/arch/next68k/next68k/locore.s Fri Jan 31 18:49:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.61 2011/12/22 15:33:30 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.62 2014/01/31 18:49:35 tsutsui Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
@@ -303,7 +303,7 @@ Lstart2:
movc %d0,%sfc | as source
movc %d0,%dfc | and destination of transfers
/* configure kernel and lwp0 VA space so we can get going */
-#if NKSYMS || defined(DDB) || defined(LKM)
+#if NKSYMS || defined(DDB) || defined(MODULAR)
RELOC(esym,%a0) | end of static kernel test/data/syms
movl %a0@,%d5
jne Lstart3
Index: src/sys/arch/x68k/x68k/locore.s
diff -u src/sys/arch/x68k/x68k/locore.s:1.112 src/sys/arch/x68k/x68k/locore.s:1.113
--- src/sys/arch/x68k/x68k/locore.s:1.112 Fri Jan 31 18:24:03 2014
+++ src/sys/arch/x68k/x68k/locore.s Fri Jan 31 18:49:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.112 2014/01/31 18:24:03 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.113 2014/01/31 18:49:35 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -197,7 +197,7 @@ Lstart1:
RELOC(physmem, %a0)
movl %d1,%a0@ | and physmem
/* configure kernel and lwp0 VA space so we can get going */
-#if NKSYMS || defined(DDB) || defined(LKM)
+#if NKSYMS || defined(DDB) || defined(MODULAR)
RELOC(esym,%a0) | end of static kernel test/data/syms
movl %a0@,%d5
jne Lstart2
