Module Name: src
Committed By: thorpej
Date: Fri Feb 26 02:18:57 UTC 2021
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/macppc/macppc: locore.S
src/sys/arch/mvmeppc/mvmeppc: locore.S
src/sys/arch/ofppc/ofppc: locore.S
src/sys/arch/powerpc/oea: cpu_subr.c
src/sys/arch/prep/prep: locore.S
src/sys/arch/rs6000/rs6000: locore.S
src/sys/arch/sandpoint/sandpoint: locore.S
Log Message:
Declare oeacpufeat once, in powerpc/oea/cpu_subr.c, rather than in
N different locore.S files.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/amigappc/amigappc/locore.S
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/bebox/bebox/locore.S
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbppc/ev64260/ev64260_locore.S
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbppc/pmppc/pmppc_locore.S
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/ibmnws/ibmnws/locore.S
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/macppc/macppc/locore.S
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/mvmeppc/mvmeppc/locore.S
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/ofppc/ofppc/locore.S
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/powerpc/oea/cpu_subr.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/prep/prep/locore.S
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/rs6000/rs6000/locore.S
cvs rdiff -u -r1.25 -r1.26 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.26 src/sys/arch/amigappc/amigappc/locore.S:1.27
--- src/sys/arch/amigappc/amigappc/locore.S:1.26 Sun Jul 15 05:16:41 2018
+++ src/sys/arch/amigappc/amigappc/locore.S Fri Feb 26 02:18:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.26 2018/07/15 05:16:41 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.27 2021/02/26 02:18:55 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -68,8 +68,6 @@ GLOBAL(startsym)
.long 0 /* start symbol table */
GLOBAL(endsym)
.long 0 /* end symbol table */
-GLOBAL(oeacpufeat)
- .long 0 /* cpu features */
GLOBAL(eclockfreq)
.long 0 /* needed by the aucc driver only */
Index: src/sys/arch/bebox/bebox/locore.S
diff -u src/sys/arch/bebox/bebox/locore.S:1.29 src/sys/arch/bebox/bebox/locore.S:1.30
--- src/sys/arch/bebox/bebox/locore.S:1.29 Sun Jul 15 05:16:41 2018
+++ src/sys/arch/bebox/bebox/locore.S Fri Feb 26 02:18:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.29 2018/07/15 05:16:41 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.30 2021/02/26 02:18:55 thorpej Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -63,8 +63,6 @@ GLOBAL(startsym)
.long 0 /* start symbol table */
GLOBAL(endsym)
.long 0 /* end symbol table */
-GLOBAL(oeacpufeat)
- .long 0 /* cpu features */
/* XXX All of this should die */
GLOBAL(intrnames)
Index: src/sys/arch/evbppc/ev64260/ev64260_locore.S
diff -u src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.20 src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.21
--- src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.20 Sun Jul 15 05:16:42 2018
+++ src/sys/arch/evbppc/ev64260/ev64260_locore.S Fri Feb 26 02:18:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ev64260_locore.S,v 1.20 2018/07/15 05:16:42 maxv Exp $ */
+/* $NetBSD: ev64260_locore.S,v 1.21 2021/02/26 02:18:56 thorpej Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -63,8 +63,6 @@ GLOBAL(startsym)
.long 0 /* start symbol table */
GLOBAL(endsym)
.long 0 /* end symbol table */
-GLOBAL(oeacpufeat)
- .long 0 /* cpu features */
/*
* File-scope for locore.S
*/
Index: src/sys/arch/evbppc/pmppc/pmppc_locore.S
diff -u src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.12 src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.13
--- src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.12 Sun Jul 15 05:16:42 2018
+++ src/sys/arch/evbppc/pmppc/pmppc_locore.S Fri Feb 26 02:18:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pmppc_locore.S,v 1.12 2018/07/15 05:16:42 maxv Exp $ */
+/* $NetBSD: pmppc_locore.S,v 1.13 2021/02/26 02:18:56 thorpej Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -64,8 +64,6 @@ GLOBAL(startsym)
.long 0 /* start symbol table */
GLOBAL(endsym)
.long 0 /* end symbol table */
-GLOBAL(oeacpufeat)
- .long 0 /* cpu features */
/*
* This symbol is here for the benefit of kvm_mkdb, and is supposed to
* mark the start of kernel text.
Index: src/sys/arch/ibmnws/ibmnws/locore.S
diff -u src/sys/arch/ibmnws/ibmnws/locore.S:1.12 src/sys/arch/ibmnws/ibmnws/locore.S:1.13
--- src/sys/arch/ibmnws/ibmnws/locore.S:1.12 Sun Jul 15 05:16:43 2018
+++ src/sys/arch/ibmnws/ibmnws/locore.S Fri Feb 26 02:18:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.12 2018/07/15 05:16:43 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.13 2021/02/26 02:18:56 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -59,8 +59,6 @@ GLOBAL(startsym)
.long 0 /* start symbol table */
GLOBAL(endsym)
.long 0 /* end symbol table */
-GLOBAL(oeacpufeat)
- .long 0 /* cpu features */
/*
* This symbol is here for the benefit of kvm_mkdb, and is supposed to
Index: src/sys/arch/macppc/macppc/locore.S
diff -u src/sys/arch/macppc/macppc/locore.S:1.78 src/sys/arch/macppc/macppc/locore.S:1.79
--- src/sys/arch/macppc/macppc/locore.S:1.78 Wed Feb 17 23:21:46 2021
+++ src/sys/arch/macppc/macppc/locore.S Fri Feb 26 02:18:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.78 2021/02/17 23:21:46 thorpej Exp $ */
+/* $NetBSD: locore.S,v 1.79 2021/02/26 02:18:56 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -62,8 +62,6 @@
.data
GLOBAL(esym)
.long 0 /* end of symbol table */
-GLOBAL(oeacpufeat)
- .long 0 /* cpu features */
/*
* This symbol is here for the benefit of kvm_mkdb, and is supposed to
Index: src/sys/arch/mvmeppc/mvmeppc/locore.S
diff -u src/sys/arch/mvmeppc/mvmeppc/locore.S:1.17 src/sys/arch/mvmeppc/mvmeppc/locore.S:1.18
--- src/sys/arch/mvmeppc/mvmeppc/locore.S:1.17 Sun Jul 15 05:16:43 2018
+++ src/sys/arch/mvmeppc/mvmeppc/locore.S Fri Feb 26 02:18:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.17 2018/07/15 05:16:43 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.18 2021/02/26 02:18:56 thorpej Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -63,8 +63,6 @@ GLOBAL(startsym)
.long 0 /* start symbol table */
GLOBAL(endsym)
.long 0 /* end symbol table */
-GLOBAL(oeacpufeat)
- .long 0 /* cpu features */
/* XXX All of this should die */
GLOBAL(intrnames)
Index: src/sys/arch/ofppc/ofppc/locore.S
diff -u src/sys/arch/ofppc/ofppc/locore.S:1.51 src/sys/arch/ofppc/ofppc/locore.S:1.52
--- src/sys/arch/ofppc/ofppc/locore.S:1.51 Wed Feb 17 23:21:47 2021
+++ src/sys/arch/ofppc/ofppc/locore.S Fri Feb 26 02:18:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.51 2021/02/17 23:21:47 thorpej Exp $ */
+/* $NetBSD: locore.S,v 1.52 2021/02/26 02:18:56 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -61,8 +61,6 @@
.data
GLOBAL(esym)
.long 0 /* end of symbol table */
-GLOBAL(oeacpufeat)
- .long 0 /* cpu features */
/*
* This symbol is here for the benefit of kvm_mkdb, and is supposed to
Index: src/sys/arch/powerpc/oea/cpu_subr.c
diff -u src/sys/arch/powerpc/oea/cpu_subr.c:1.105 src/sys/arch/powerpc/oea/cpu_subr.c:1.106
--- src/sys/arch/powerpc/oea/cpu_subr.c:1.105 Wed Feb 24 16:42:38 2021
+++ src/sys/arch/powerpc/oea/cpu_subr.c Fri Feb 26 02:18:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_subr.c,v 1.105 2021/02/24 16:42:38 thorpej Exp $ */
+/* $NetBSD: cpu_subr.c,v 1.106 2021/02/26 02:18:57 thorpej Exp $ */
/*-
* Copyright (c) 2001 Matt Thomas.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.105 2021/02/24 16:42:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.106 2021/02/26 02:18:57 thorpej Exp $");
#include "sysmon_envsys.h"
@@ -265,6 +265,8 @@ register_t cpu_psluserset;
register_t cpu_pslusermod;
register_t cpu_pslusermask = 0xffff;
+unsigned long oeacpufeat;
+
/* This is to be called from locore.S, and nowhere else. */
void
Index: src/sys/arch/prep/prep/locore.S
diff -u src/sys/arch/prep/prep/locore.S:1.20 src/sys/arch/prep/prep/locore.S:1.21
--- src/sys/arch/prep/prep/locore.S:1.20 Sun Jul 15 05:16:44 2018
+++ src/sys/arch/prep/prep/locore.S Fri Feb 26 02:18:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.20 2018/07/15 05:16:44 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.21 2021/02/26 02:18:56 thorpej Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -74,8 +74,6 @@ GLOBAL(startsym)
.long 0 /* start symbol table */
GLOBAL(endsym)
.long 0 /* end symbol table */
-GLOBAL(oeacpufeat)
- .long 0 /* cpu features */
/*
* This symbol is here for the benefit of kvm_mkdb, and is supposed to
Index: src/sys/arch/rs6000/rs6000/locore.S
diff -u src/sys/arch/rs6000/rs6000/locore.S:1.12 src/sys/arch/rs6000/rs6000/locore.S:1.13
--- src/sys/arch/rs6000/rs6000/locore.S:1.12 Sun Jul 15 05:16:44 2018
+++ src/sys/arch/rs6000/rs6000/locore.S Fri Feb 26 02:18:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.12 2018/07/15 05:16:44 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.13 2021/02/26 02:18:56 thorpej Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -78,8 +78,6 @@ GLOBAL(startsym)
.long 0 /* start symbol table */
GLOBAL(endsym)
.long 0 /* end symbol table */
-GLOBAL(oeacpufeat)
- .long 0 /* cpu features */
/*
* This symbol is here for the benefit of kvm_mkdb, and is supposed to
* mark the start of kernel text.
Index: src/sys/arch/sandpoint/sandpoint/locore.S
diff -u src/sys/arch/sandpoint/sandpoint/locore.S:1.25 src/sys/arch/sandpoint/sandpoint/locore.S:1.26
--- src/sys/arch/sandpoint/sandpoint/locore.S:1.25 Sun Jul 15 05:16:44 2018
+++ src/sys/arch/sandpoint/sandpoint/locore.S Fri Feb 26 02:18:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.25 2018/07/15 05:16:44 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.26 2021/02/26 02:18:57 thorpej Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -64,8 +64,6 @@ GLOBAL(startsym)
.long 0 /* start symbol table */
GLOBAL(endsym)
.long 0 /* end symbol table */
-GLOBAL(oeacpufeat)
- .long 0 /* cpu features */
/*
* This symbol is here for the benefit of kvm_mkdb, and is supposed to
* mark the start of kernel text.
