[src/trunk]: src/sys/arch Fix some historical powerpc curiocity which had ker...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch Fix some historical powerpc curiocity which had ker...
From: pooka <pooka%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 18:38:51 +0000
details:   https://anonhg.NetBSD.org/src/rev/7f84d786274a
branches:  trunk
changeset: 752660:7f84d786274a
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed Mar 03 00:30:15 2010 +0000

description:
Fix some historical powerpc curiocity which had kernfs depend on
startsym/endsym, and which crept into most powerpc ports.

diffstat:

 sys/arch/amigappc/amigappc/locore.S      |  5 ++---
 sys/arch/bebox/bebox/locore.S            |  5 ++---
 sys/arch/evbppc/ev64260/ev64260_locore.S |  5 ++---
 sys/arch/evbppc/pmppc/pmppc_locore.S     |  3 +--
 sys/arch/ibmnws/ibmnws/locore.S          |  5 ++---
 sys/arch/mvmeppc/mvmeppc/locore.S        |  5 ++---
 sys/arch/prep/prep/locore.S              |  5 ++---
 sys/arch/rs6000/rs6000/locore.S          |  5 ++---
 sys/arch/sandpoint/sandpoint/locore.S    |  5 ++---
 9 files changed, 17 insertions(+), 26 deletions(-)

diffs (225 lines):

diff -r d7e9f6c3b4be -r 7f84d786274a sys/arch/amigappc/amigappc/locore.S
--- a/sys/arch/amigappc/amigappc/locore.S       Wed Mar 03 00:09:03 2010 +0000
+++ b/sys/arch/amigappc/amigappc/locore.S       Wed Mar 03 00:30:15 2010 +0000
@@ -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)+3@ha
        addi    6,6,_C_LABEL(end)+3@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 ? */
diff -r d7e9f6c3b4be -r 7f84d786274a sys/arch/bebox/bebox/locore.S
--- a/sys/arch/bebox/bebox/locore.S     Wed Mar 03 00:09:03 2010 +0000
+++ b/sys/arch/bebox/bebox/locore.S     Wed Mar 03 00:30:15 2010 +0000
@@ -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)
diff -r d7e9f6c3b4be -r 7f84d786274a sys/arch/evbppc/ev64260/ev64260_locore.S
--- a/sys/arch/evbppc/ev64260/ev64260_locore.S  Wed Mar 03 00:09:03 2010 +0000
+++ b/sys/arch/evbppc/ev64260/ev64260_locore.S  Wed Mar 03 00:30:15 2010 +0000
@@ -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)
diff -r d7e9f6c3b4be -r 7f84d786274a sys/arch/evbppc/pmppc/pmppc_locore.S
--- a/sys/arch/evbppc/pmppc/pmppc_locore.S      Wed Mar 03 00:09:03 2010 +0000
+++ b/sys/arch/evbppc/pmppc/pmppc_locore.S      Wed Mar 03 00:30:15 2010 +0000
@@ -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"
diff -r d7e9f6c3b4be -r 7f84d786274a sys/arch/ibmnws/ibmnws/locore.S
--- a/sys/arch/ibmnws/ibmnws/locore.S   Wed Mar 03 00:09:03 2010 +0000
+++ b/sys/arch/ibmnws/ibmnws/locore.S   Wed Mar 03 00:30:15 2010 +0000
@@ -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)
diff -r d7e9f6c3b4be -r 7f84d786274a sys/arch/mvmeppc/mvmeppc/locore.S
--- a/sys/arch/mvmeppc/mvmeppc/locore.S Wed Mar 03 00:09:03 2010 +0000
+++ b/sys/arch/mvmeppc/mvmeppc/locore.S Wed Mar 03 00:30:15 2010 +0000
@@ -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)
diff -r d7e9f6c3b4be -r 7f84d786274a sys/arch/prep/prep/locore.S
--- a/sys/arch/prep/prep/locore.S       Wed Mar 03 00:09:03 2010 +0000
+++ b/sys/arch/prep/prep/locore.S       Wed Mar 03 00:30:15 2010 +0000
@@ -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)
diff -r d7e9f6c3b4be -r 7f84d786274a sys/arch/rs6000/rs6000/locore.S
--- a/sys/arch/rs6000/rs6000/locore.S   Wed Mar 03 00:09:03 2010 +0000
+++ b/sys/arch/rs6000/rs6000/locore.S   Wed Mar 03 00:30:15 2010 +0000
@@ -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)
diff -r d7e9f6c3b4be -r 7f84d786274a sys/arch/sandpoint/sandpoint/locore.S
--- a/sys/arch/sandpoint/sandpoint/locore.S     Wed Mar 03 00:09:03 2010 +0000
+++ b/sys/arch/sandpoint/sandpoint/locore.S     Wed Mar 03 00:30:15 2010 +0000
@@ -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)
Prev by Date: [src/trunk]: src/sys/modules/ffs -DFFS is no longer necessary
Next by Date: [src/trunk]: src/sys/arch/xen/x86 Use roundup2() instead of hardcoding the CA...
Previous by Thread: [src/trunk]: src/sys/modules/ffs -DFFS is no longer necessary
Next by Thread: [src/trunk]: src/sys/arch/xen/x86 Use roundup2() instead of hardcoding the CA...
Indexes:
Home | Main Index | Thread Index | Old Index