Module Name: src
Committed By: pooka
Date: Wed Mar 3 00:30:16 UTC 2010
Modified Files:
src/sys/arch/amigappc/amigappc: locore.S
src/sys/arch/bebox/bebox: locore.S
src/sys/arch/evbppc/ev64260: ev64260_locore.S
src/sys/arch/evbppc/pmppc: pmppc_locore.S
src/sys/arch/ibmnws/ibmnws: locore.S
src/sys/arch/mvmeppc/mvmeppc: locore.S
src/sys/arch/prep/prep: locore.S
src/sys/arch/rs6000/rs6000: locore.S
src/sys/arch/sandpoint/sandpoint: locore.S
Log Message:
Fix some historical powerpc curiocity which had kernfs depend on
startsym/endsym, and which crept into most powerpc ports.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/amigappc/amigappc/locore.S
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/bebox/bebox/locore.S
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbppc/ev64260/ev64260_locore.S
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/pmppc/pmppc_locore.S
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ibmnws/ibmnws/locore.S
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mvmeppc/mvmeppc/locore.S
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/prep/prep/locore.S
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/rs6000/rs6000/locore.S
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sandpoint/sandpoint/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/amigappc/amigappc/locore.S
diff -u src/sys/arch/amigappc/amigappc/locore.S:1.19 src/sys/arch/amigappc/amigappc/locore.S:1.20
--- src/sys/arch/amigappc/amigappc/locore.S:1.19 Thu Feb 25 23:33:43 2010
+++ src/sys/arch/amigappc/amigappc/locore.S Wed Mar 3 00:30:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.19 2010/02/25 23:33:43 matt Exp $ */
+/* $NetBSD: locore.S,v 1.20 2010/03/03 00:30:15 pooka Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -36,7 +36,6 @@
* Rewritten for 4.0 and bootargs support by Frank Wille.
*/
#include "opt_ddb.h"
-#include "fs_kernfs.h"
#include "opt_ipkdb.h"
#include "opt_lockdebug.h"
#include "opt_multiprocessor.h"
@@ -167,7 +166,7 @@
lis 6,_C_LABEL(end)+...@ha
addi 6,6,_C_LABEL(end)+...@l
rlwinm 7,6,0,0,29 /* startsym = end - 32-bit alignment */
-#if NKSYMS || defined(DDB) || defined(MODULAR) || defined(KERNFS)
+#if NKSYMS || defined(DDB) || defined(MODULAR)
lis 8,_C_LABEL(startsym)@ha
stw 7,_C_LABEL(startsym)@l(8)
mr. 27,27 /* esym == 0 ? */
Index: src/sys/arch/bebox/bebox/locore.S
diff -u src/sys/arch/bebox/bebox/locore.S:1.20 src/sys/arch/bebox/bebox/locore.S:1.21
--- src/sys/arch/bebox/bebox/locore.S:1.20 Thu Feb 25 23:33:44 2010
+++ src/sys/arch/bebox/bebox/locore.S Wed Mar 3 00:30:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.20 2010/02/25 23:33:44 matt Exp $ */
+/* $NetBSD: locore.S,v 1.21 2010/03/03 00:30:15 pooka Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -33,7 +33,6 @@
*/
#include "opt_ddb.h"
-#include "fs_kernfs.h"
#include "opt_ipkdb.h"
#include "opt_lockdebug.h"
#include "opt_modular.h"
@@ -153,7 +152,7 @@
__start_cpu0:
/* compute end of kernel memory */
-#if defined(DDB) || defined(KERNFS) || NKSYMS || defined(MODULAR)
+#if defined(DDB) || NKSYMS || defined(MODULAR)
lis 7,_C_LABEL(startsym)@ha
addi 7,7,_C_LABEL(startsym)@l
stw 3,0(7)
Index: src/sys/arch/evbppc/ev64260/ev64260_locore.S
diff -u src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.14 src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.15
--- src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.14 Sat Feb 27 22:12:31 2010
+++ src/sys/arch/evbppc/ev64260/ev64260_locore.S Wed Mar 3 00:30:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ev64260_locore.S,v 1.14 2010/02/27 22:12:31 snj Exp $ */
+/* $NetBSD: ev64260_locore.S,v 1.15 2010/03/03 00:30:15 pooka Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -33,7 +33,6 @@
*/
#include "opt_ddb.h"
-#include "fs_kernfs.h"
#include "opt_ppcparam.h"
#include "opt_ipkdb.h"
#include "opt_modular.h"
@@ -214,7 +213,7 @@
/* compute end of kernel memory */
lis 8,_C_LABEL(end)@ha
addi 8,8,_C_LABEL(end)@l
-#if NKSYMS || defined(DDB) || defined(MODULAR) || defined(KERNFS)
+#if NKSYMS || defined(DDB) || defined(MODULAR)
lis 7,_C_LABEL(startsym)@ha
addi 7,7,_C_LABEL(startsym)@l
stw 3,0(7)
Index: src/sys/arch/evbppc/pmppc/pmppc_locore.S
diff -u src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.6 src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.7
--- src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.6 Sat Feb 27 22:12:31 2010
+++ src/sys/arch/evbppc/pmppc/pmppc_locore.S Wed Mar 3 00:30:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmppc_locore.S,v 1.6 2010/02/27 22:12:31 snj Exp $ */
+/* $NetBSD: pmppc_locore.S,v 1.7 2010/03/03 00:30:15 pooka Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -34,7 +34,6 @@
#include "opt_ddb.h"
#include "opt_kgdb.h"
-#include "fs_kernfs.h"
#include "opt_ipkdb.h"
#include "opt_multiprocessor.h"
#include "opt_openpic.h"
Index: src/sys/arch/ibmnws/ibmnws/locore.S
diff -u src/sys/arch/ibmnws/ibmnws/locore.S:1.7 src/sys/arch/ibmnws/ibmnws/locore.S:1.8
--- src/sys/arch/ibmnws/ibmnws/locore.S:1.7 Thu Feb 25 23:33:45 2010
+++ src/sys/arch/ibmnws/ibmnws/locore.S Wed Mar 3 00:30:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.7 2010/02/25 23:33:45 matt Exp $ */
+/* $NetBSD: locore.S,v 1.8 2010/03/03 00:30:15 pooka Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -34,7 +34,6 @@
#define _NOREGNAMES
#include "opt_ddb.h"
-#include "fs_kernfs.h"
#include "opt_ipkdb.h"
#include "opt_lockdebug.h"
#include "opt_ppcparam.h"
@@ -114,7 +113,7 @@
/* compute end of kernel memory */
lis 8,_C_LABEL(end)@ha
addi 8,8,_C_LABEL(end)@l
-#if defined(DDB) || defined(KERNFS)
+#if defined(DDB)
lis 7,_C_LABEL(startsym)@ha
addi 7,7,_C_LABEL(startsym)@l
stw 3,0(7)
Index: src/sys/arch/mvmeppc/mvmeppc/locore.S
diff -u src/sys/arch/mvmeppc/mvmeppc/locore.S:1.11 src/sys/arch/mvmeppc/mvmeppc/locore.S:1.12
--- src/sys/arch/mvmeppc/mvmeppc/locore.S:1.11 Thu Feb 25 23:33:45 2010
+++ src/sys/arch/mvmeppc/mvmeppc/locore.S Wed Mar 3 00:30:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.11 2010/02/25 23:33:45 matt Exp $ */
+/* $NetBSD: locore.S,v 1.12 2010/03/03 00:30:15 pooka Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -33,7 +33,6 @@
*/
#include "opt_ddb.h"
-#include "fs_kernfs.h"
#include "opt_ipkdb.h"
#include "opt_lockdebug.h"
#include "opt_modular.h"
@@ -114,7 +113,7 @@
isync
/* compute end of kernel memory */
-#if NKSYMS || defined(DDB) || defined(MODULAR) || defined(KERNFS)
+#if NKSYMS || defined(DDB) || defined(MODULAR)
lis %r7,_C_LABEL(startsym)@ha
addi %r7,%r7,_C_LABEL(startsym)@l
stw %r3,0(%r7)
Index: src/sys/arch/prep/prep/locore.S
diff -u src/sys/arch/prep/prep/locore.S:1.14 src/sys/arch/prep/prep/locore.S:1.15
--- src/sys/arch/prep/prep/locore.S:1.14 Tue Mar 2 21:52:32 2010
+++ src/sys/arch/prep/prep/locore.S Wed Mar 3 00:30:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.14 2010/03/02 21:52:32 matt Exp $ */
+/* $NetBSD: locore.S,v 1.15 2010/03/03 00:30:15 pooka Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -33,7 +33,6 @@
*/
#include "opt_ddb.h"
-#include "fs_kernfs.h"
#include "opt_ipkdb.h"
#include "opt_lockdebug.h"
#include "opt_modular.h"
@@ -102,7 +101,7 @@
isync
/* compute end of kernel memory */
-#if NKSYMS || defined(DDB) || defined(MODULAR) || defined(KERNFS)
+#if NKSYMS || defined(DDB) || defined(MODULAR)
lis 7,_C_LABEL(startsym)@ha
addi 7,7,_C_LABEL(startsym)@l
stw 3,0(7)
Index: src/sys/arch/rs6000/rs6000/locore.S
diff -u src/sys/arch/rs6000/rs6000/locore.S:1.6 src/sys/arch/rs6000/rs6000/locore.S:1.7
--- src/sys/arch/rs6000/rs6000/locore.S:1.6 Thu Feb 25 23:33:45 2010
+++ src/sys/arch/rs6000/rs6000/locore.S Wed Mar 3 00:30:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.6 2010/02/25 23:33:45 matt Exp $ */
+/* $NetBSD: locore.S,v 1.7 2010/03/03 00:30:16 pooka Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -33,7 +33,6 @@
*/
#include "opt_ddb.h"
-#include "fs_kernfs.h"
#include "opt_ipkdb.h"
#include "opt_lockdebug.h"
#include "opt_modular.h"
@@ -107,7 +106,7 @@
/* compute end of kernel memory */
-#if NKSYMS || defined(DDB) || defined(MODULAR) || defined(KERNFS)
+#if NKSYMS || defined(DDB) || defined(MODULAR)
lis 7,_C_LABEL(startsym)@ha
addi 7,7,_C_LABEL(startsym)@l
stw 3,0(7)
Index: src/sys/arch/sandpoint/sandpoint/locore.S
diff -u src/sys/arch/sandpoint/sandpoint/locore.S:1.18 src/sys/arch/sandpoint/sandpoint/locore.S:1.19
--- src/sys/arch/sandpoint/sandpoint/locore.S:1.18 Sat Feb 27 22:12:32 2010
+++ src/sys/arch/sandpoint/sandpoint/locore.S Wed Mar 3 00:30:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.18 2010/02/27 22:12:32 snj Exp $ */
+/* $NetBSD: locore.S,v 1.19 2010/03/03 00:30:16 pooka Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -33,7 +33,6 @@
*/
#include "opt_ddb.h"
-#include "fs_kernfs.h"
#include "opt_ipkdb.h"
#include "opt_modular.h"
#include "opt_multiprocessor.h"
@@ -96,7 +95,7 @@
mtspr 1008,8
/* compute end of kernel memory */
-#if NKSYMS || defined(DDB) || defined(MODULAR) || defined(KERNFS)
+#if NKSYMS || defined(DDB) || defined(MODULAR)
lis 7,_C_LABEL(startsym)@ha
addi 7,7,_C_LABEL(startsym)@l
stw 3,0(7)
