summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2021-02-26 02:18:55 +0000
committerthorpej <thorpej@NetBSD.org>2021-02-26 02:18:55 +0000
commitd074464ccb086ccfa85fa2eccb4af76bc64c9aa7 (patch)
tree294c8f83bc800a7e84b6f03578f2b2e01086e67c /sys
parentf78f7071f57ff5ad5f3adcdf51d9e9c379f78d45 (diff)
Declare oeacpufeat once, in powerpc/oea/cpu_subr.c, rather than in
N different locore.S files.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amigappc/amigappc/locore.S4
-rw-r--r--sys/arch/bebox/bebox/locore.S4
-rw-r--r--sys/arch/evbppc/ev64260/ev64260_locore.S4
-rw-r--r--sys/arch/evbppc/pmppc/pmppc_locore.S4
-rw-r--r--sys/arch/ibmnws/ibmnws/locore.S4
-rw-r--r--sys/arch/macppc/macppc/locore.S4
-rw-r--r--sys/arch/mvmeppc/mvmeppc/locore.S4
-rw-r--r--sys/arch/ofppc/ofppc/locore.S4
-rw-r--r--sys/arch/powerpc/oea/cpu_subr.c6
-rw-r--r--sys/arch/prep/prep/locore.S4
-rw-r--r--sys/arch/rs6000/rs6000/locore.S4
-rw-r--r--sys/arch/sandpoint/sandpoint/locore.S4
12 files changed, 15 insertions, 35 deletions
diff --git a/sys/arch/amigappc/amigappc/locore.S b/sys/arch/amigappc/amigappc/locore.S
index 52e8e93bf09..9d0042fdc75 100644
--- a/sys/arch/amigappc/amigappc/locore.S
+++ b/sys/arch/amigappc/amigappc/locore.S
@@ -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 */
diff --git a/sys/arch/bebox/bebox/locore.S b/sys/arch/bebox/bebox/locore.S
index a58b90bf5a7..21affd88313 100644
--- a/sys/arch/bebox/bebox/locore.S
+++ b/sys/arch/bebox/bebox/locore.S
@@ -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)
diff --git a/sys/arch/evbppc/ev64260/ev64260_locore.S b/sys/arch/evbppc/ev64260/ev64260_locore.S
index a360084b566..7ccf4b2aba8 100644
--- a/sys/arch/evbppc/ev64260/ev64260_locore.S
+++ b/sys/arch/evbppc/ev64260/ev64260_locore.S
@@ -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
*/
diff --git a/sys/arch/evbppc/pmppc/pmppc_locore.S b/sys/arch/evbppc/pmppc/pmppc_locore.S
index 40a6cbcd867..365a86a8778 100644
--- a/sys/arch/evbppc/pmppc/pmppc_locore.S
+++ b/sys/arch/evbppc/pmppc/pmppc_locore.S
@@ -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.
diff --git a/sys/arch/ibmnws/ibmnws/locore.S b/sys/arch/ibmnws/ibmnws/locore.S
index dc26db80d13..05f2ca62be3 100644
--- a/sys/arch/ibmnws/ibmnws/locore.S
+++ b/sys/arch/ibmnws/ibmnws/locore.S
@@ -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
diff --git a/sys/arch/macppc/macppc/locore.S b/sys/arch/macppc/macppc/locore.S
index 35993c9c136..465f2633071 100644
--- a/sys/arch/macppc/macppc/locore.S
+++ b/sys/arch/macppc/macppc/locore.S
@@ -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
diff --git a/sys/arch/mvmeppc/mvmeppc/locore.S b/sys/arch/mvmeppc/mvmeppc/locore.S
index 91ea325c7cc..3309e7ad66e 100644
--- a/sys/arch/mvmeppc/mvmeppc/locore.S
+++ b/sys/arch/mvmeppc/mvmeppc/locore.S
@@ -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)
diff --git a/sys/arch/ofppc/ofppc/locore.S b/sys/arch/ofppc/ofppc/locore.S
index d0b616dbe80..7abf1cacb4d 100644
--- a/sys/arch/ofppc/ofppc/locore.S
+++ b/sys/arch/ofppc/ofppc/locore.S
@@ -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
diff --git a/sys/arch/powerpc/oea/cpu_subr.c b/sys/arch/powerpc/oea/cpu_subr.c
index 929e870825b..d0917cf8d4b 100644
--- a/sys/arch/powerpc/oea/cpu_subr.c
+++ b/sys/arch/powerpc/oea/cpu_subr.c
@@ -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
diff --git a/sys/arch/prep/prep/locore.S b/sys/arch/prep/prep/locore.S
index e85ff8bec0b..af4d7f31218 100644
--- a/sys/arch/prep/prep/locore.S
+++ b/sys/arch/prep/prep/locore.S
@@ -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
diff --git a/sys/arch/rs6000/rs6000/locore.S b/sys/arch/rs6000/rs6000/locore.S
index 7ffbf6d5d94..e3e95f1435c 100644
--- a/sys/arch/rs6000/rs6000/locore.S
+++ b/sys/arch/rs6000/rs6000/locore.S
@@ -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.
diff --git a/sys/arch/sandpoint/sandpoint/locore.S b/sys/arch/sandpoint/sandpoint/locore.S
index bb709841550..d8aec33b0f0 100644
--- a/sys/arch/sandpoint/sandpoint/locore.S
+++ b/sys/arch/sandpoint/sandpoint/locore.S
@@ -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.