Module Name: src
Committed By: martin
Date: Sat Oct 14 06:52:18 UTC 2023
Modified Files:
src/sys/arch/arm/arm32 [netbsd-10]: pmap.c
src/sys/arch/arm/include/arm32 [netbsd-10]: pmap.h
src/sys/arch/evbarm/adi_brh [netbsd-10]: brh_machdep.c
src/sys/arch/evbarm/g42xxeb [netbsd-10]: g42xxeb_machdep.c
src/sys/arch/evbarm/gumstix [netbsd-10]: gumstix_machdep.c
src/sys/arch/evbarm/hdl_g [netbsd-10]: hdlg_machdep.c
src/sys/arch/evbarm/iq80310 [netbsd-10]: iq80310_machdep.c
src/sys/arch/evbarm/iq80321 [netbsd-10]: iq80321_machdep.c
src/sys/arch/evbarm/ixdp425 [netbsd-10]: ixdp425_machdep.c
src/sys/arch/evbarm/iyonix [netbsd-10]: iyonix_machdep.c
src/sys/arch/evbarm/lubbock [netbsd-10]: lubbock_machdep.c
src/sys/arch/evbarm/npwr_fc [netbsd-10]: npwr_fc_machdep.c
src/sys/arch/evbarm/nslu2 [netbsd-10]: nslu2_machdep.c
src/sys/arch/evbarm/viper [netbsd-10]: viper_machdep.c
src/sys/arch/hpcarm/hpcarm [netbsd-10]: pxa2x0_hpc_machdep.c
src/sys/arch/iyonix/iyonix [netbsd-10]: iyonix_machdep.c
src/sys/arch/zaurus/zaurus [netbsd-10]: machdep.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #411):
sys/arch/evbarm/nslu2/nslu2_machdep.c: revision 1.41
sys/arch/evbarm/gumstix/gumstix_machdep.c: revision 1.75
sys/arch/evbarm/iq80321/iq80321_machdep.c: revision 1.66
sys/arch/iyonix/iyonix/iyonix_machdep.c: revision 1.34
sys/arch/zaurus/zaurus/machdep.c: revision 1.52
sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c: revision 1.41
sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c: revision 1.33
sys/arch/evbarm/iq80310/iq80310_machdep.c: revision 1.96
sys/arch/evbarm/adi_brh/brh_machdep.c: revision 1.53
sys/arch/arm/include/arm32/pmap.h: revision 1.177
sys/arch/evbarm/viper/viper_machdep.c: revision 1.34
sys/arch/evbarm/iyonix/iyonix_machdep.c: revision 1.5
sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c: revision 1.30
sys/arch/evbarm/hdl_g/hdlg_machdep.c: revision 1.35
sys/arch/arm/arm32/pmap.c: revision 1.440
sys/arch/evbarm/lubbock/lubbock_machdep.c: revision 1.45
sys/arch/evbarm/ixdp425/ixdp425_machdep.c: revision 1.47
Fix non-DIAGNOSTIC builds
To generate a diff of this commit:
cvs rdiff -u -r1.437.4.1 -r1.437.4.2 src/sys/arch/arm/arm32/pmap.c
cvs rdiff -u -r1.173 -r1.173.4.1 src/sys/arch/arm/include/arm32/pmap.h
cvs rdiff -u -r1.51 -r1.51.4.1 src/sys/arch/evbarm/adi_brh/brh_machdep.c
cvs rdiff -u -r1.39 -r1.39.4.1 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
cvs rdiff -u -r1.72 -r1.72.2.1 src/sys/arch/evbarm/gumstix/gumstix_machdep.c
cvs rdiff -u -r1.33 -r1.33.4.1 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c
cvs rdiff -u -r1.94 -r1.94.4.1 src/sys/arch/evbarm/iq80310/iq80310_machdep.c
cvs rdiff -u -r1.64 -r1.64.4.1 src/sys/arch/evbarm/iq80321/iq80321_machdep.c
cvs rdiff -u -r1.46 -r1.46.4.1 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
cvs rdiff -u -r1.4 -r1.4.20.1 src/sys/arch/evbarm/iyonix/iyonix_machdep.c
cvs rdiff -u -r1.42 -r1.42.4.1 src/sys/arch/evbarm/lubbock/lubbock_machdep.c
cvs rdiff -u -r1.29 -r1.29.4.1 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
cvs rdiff -u -r1.35 -r1.35.4.1 src/sys/arch/evbarm/nslu2/nslu2_machdep.c
cvs rdiff -u -r1.33 -r1.33.4.1 src/sys/arch/evbarm/viper/viper_machdep.c
cvs rdiff -u -r1.30 -r1.30.4.1 \
src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
cvs rdiff -u -r1.31 -r1.31.4.1 src/sys/arch/iyonix/iyonix/iyonix_machdep.c
cvs rdiff -u -r1.50 -r1.50.4.1 src/sys/arch/zaurus/zaurus/machdep.c
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/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.437.4.1 src/sys/arch/arm/arm32/pmap.c:1.437.4.2
--- src/sys/arch/arm/arm32/pmap.c:1.437.4.1 Mon Dec 19 11:44:29 2022
+++ src/sys/arch/arm/arm32/pmap.c Sat Oct 14 06:52:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.437.4.1 2022/12/19 11:44:29 martin Exp $ */
+/* $NetBSD: pmap.c,v 1.437.4.2 2023/10/14 06:52:17 martin Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -193,7 +193,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.437.4.1 2022/12/19 11:44:29 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.437.4.2 2023/10/14 06:52:17 martin Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -7654,8 +7654,6 @@ pmap_pte_init_xscale(void)
void
xscale_setup_minidata(vaddr_t l1pt, vaddr_t va, paddr_t pa)
{
- extern vaddr_t xscale_minidata_clean_addr;
- extern vsize_t xscale_minidata_clean_size; /* already initialized */
pd_entry_t *pde = (pd_entry_t *) l1pt;
vsize_t size;
uint32_t auxctl;
Index: src/sys/arch/arm/include/arm32/pmap.h
diff -u src/sys/arch/arm/include/arm32/pmap.h:1.173 src/sys/arch/arm/include/arm32/pmap.h:1.173.4.1
--- src/sys/arch/arm/include/arm32/pmap.h:1.173 Sat Apr 2 11:16:07 2022
+++ src/sys/arch/arm/include/arm32/pmap.h Sat Oct 14 06:52:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.173 2022/04/02 11:16:07 skrll Exp $ */
+/* $NetBSD: pmap.h,v 1.173.4.1 2023/10/14 06:52:17 martin Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -751,6 +751,15 @@ extern pt_entry_t pte_l2_s_proto;
extern void (*pmap_copy_page_func)(paddr_t, paddr_t);
extern void (*pmap_zero_page_func)(paddr_t);
+/*
+ * Global varaiables in cpufunc_asm_xscale.S supporting the Xscale
+ * cache clean/purge functions.
+ */
+extern vaddr_t xscale_minidata_clean_addr;
+extern vsize_t xscale_minidata_clean_size;
+extern vaddr_t xscale_cache_clean_addr;
+extern vsize_t xscale_cache_clean_size;
+
#endif /* !_LOCORE */
/*****************************************************************************/
Index: src/sys/arch/evbarm/adi_brh/brh_machdep.c
diff -u src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.51 src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.51.4.1
--- src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.51 Tue Aug 17 22:00:27 2021
+++ src/sys/arch/evbarm/adi_brh/brh_machdep.c Sat Oct 14 06:52:16 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: brh_machdep.c,v 1.51 2021/08/17 22:00:27 andvar Exp $ */
+/* $NetBSD: brh_machdep.c,v 1.51.4.1 2023/10/14 06:52:16 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.51 2021/08/17 22:00:27 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.51.4.1 2023/10/14 06:52:16 martin Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -349,10 +349,6 @@ brh_hardclock_hook(void)
vaddr_t
initarm(void *arg)
{
- extern vaddr_t xscale_cache_clean_addr;
-#ifdef DIAGNOSTIC
- extern vsize_t xscale_minidata_clean_size;
-#endif
int loop;
int loop1;
u_int l1pagetable;
Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.39 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.39.4.1
--- src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.39 Sun Jul 3 19:58:42 2022
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c Sat Oct 14 06:52:16 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: g42xxeb_machdep.c,v 1.39 2022/07/03 19:58:42 andvar Exp $ */
+/* $NetBSD: g42xxeb_machdep.c,v 1.39.4.1 2023/10/14 06:52:16 martin Exp $ */
/*
* Copyright (c) 2002, 2003, 2004, 2005 Genetec Corporation.
@@ -398,16 +398,12 @@ static const struct pmap_devmap g42xxeb_
vaddr_t
initarm(void *arg)
{
- extern vaddr_t xscale_cache_clean_addr;
int loop;
int loop1;
u_int l1pagetable;
paddr_t memstart;
psize_t memsize;
int led_data = 1;
-#ifdef DIAGNOSTIC
- extern vsize_t xscale_minidata_clean_size; /* used in KASSERT */
-#endif
#define LEDSTEP_P() ioreg8_write(G42XXEB_PLDREG_BASE+G42XXEB_LED, led_data++)
#define LEDSTEP() pldreg8_write(G42XXEB_LED, led_data++);
Index: src/sys/arch/evbarm/gumstix/gumstix_machdep.c
diff -u src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.72 src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.72.2.1
--- src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.72 Sat Oct 29 13:10:25 2022
+++ src/sys/arch/evbarm/gumstix/gumstix_machdep.c Sat Oct 14 06:52:15 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: gumstix_machdep.c,v 1.72 2022/10/29 13:10:25 jmcneill Exp $ */
+/* $NetBSD: gumstix_machdep.c,v 1.72.2.1 2023/10/14 06:52:15 martin Exp $ */
/*
* Copyright (C) 2005, 2006, 2007 WIDE Project and SOUM Corporation.
* All rights reserved.
@@ -381,7 +381,6 @@ initarm(void *arg)
* 0xa0000000 - 0xa3ffffff SDRAM Bank 0 (64MB or 128MB)
* 0xc0000000 - 0xc3ffffff KERNEL_BASE
*/
- extern vaddr_t xscale_cache_clean_addr;
xscale_cache_clean_addr = 0xff000000U;
cpu_reset_address = NULL;
Index: src/sys/arch/evbarm/hdl_g/hdlg_machdep.c
diff -u src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.33 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.33.4.1
--- src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.33 Tue Jan 4 10:38:04 2022
+++ src/sys/arch/evbarm/hdl_g/hdlg_machdep.c Sat Oct 14 06:52:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: hdlg_machdep.c,v 1.33 2022/01/04 10:38:04 skrll Exp $ */
+/* $NetBSD: hdlg_machdep.c,v 1.33.4.1 2023/10/14 06:52:17 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.33 2022/01/04 10:38:04 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.33.4.1 2023/10/14 06:52:17 martin Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -227,8 +227,6 @@ hardclock_hook(void)
vaddr_t
initarm(void *arg)
{
- extern vaddr_t xscale_cache_clean_addr;
- extern vsize_t xscale_minidata_clean_size;
int loop;
int loop1;
u_int l1pagetable;
Index: src/sys/arch/evbarm/iq80310/iq80310_machdep.c
diff -u src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.94 src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.94.4.1
--- src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.94 Tue Aug 17 22:00:28 2021
+++ src/sys/arch/evbarm/iq80310/iq80310_machdep.c Sat Oct 14 06:52:16 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_machdep.c,v 1.94 2021/08/17 22:00:28 andvar Exp $ */
+/* $NetBSD: iq80310_machdep.c,v 1.94.4.1 2023/10/14 06:52:16 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.94 2021/08/17 22:00:28 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.94.4.1 2023/10/14 06:52:16 martin Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -317,10 +317,6 @@ static const struct pmap_devmap iq80310_
vaddr_t
initarm(void *arg)
{
- extern vaddr_t xscale_cache_clean_addr;
-#ifdef DIAGNOSTIC
- extern vsize_t xscale_minidata_clean_size;
-#endif
int loop;
int loop1;
u_int l1pagetable;
Index: src/sys/arch/evbarm/iq80321/iq80321_machdep.c
diff -u src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.64 src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.64.4.1
--- src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.64 Tue Aug 17 22:00:28 2021
+++ src/sys/arch/evbarm/iq80321/iq80321_machdep.c Sat Oct 14 06:52:16 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80321_machdep.c,v 1.64 2021/08/17 22:00:28 andvar Exp $ */
+/* $NetBSD: iq80321_machdep.c,v 1.64.4.1 2023/10/14 06:52:16 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.64 2021/08/17 22:00:28 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.64.4.1 2023/10/14 06:52:16 martin Exp $");
#include "opt_console.h"
#include "opt_ddb.h"
@@ -365,10 +365,6 @@ iq80321_hardclock_hook(void)
vaddr_t
initarm(void *arg)
{
- extern vaddr_t xscale_cache_clean_addr;
-#ifdef DIAGNOSTIC
- extern vsize_t xscale_minidata_clean_size;
-#endif
int loop;
int loop1;
u_int l1pagetable;
Index: src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
diff -u src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.46 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.46.4.1
--- src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.46 Tue Aug 17 22:00:28 2021
+++ src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c Sat Oct 14 06:52:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixdp425_machdep.c,v 1.46 2021/08/17 22:00:28 andvar Exp $ */
+/* $NetBSD: ixdp425_machdep.c,v 1.46.4.1 2023/10/14 06:52:18 martin Exp $ */
/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.46 2021/08/17 22:00:28 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.46.4.1 2023/10/14 06:52:18 martin Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -370,10 +370,6 @@ static const struct pmap_devmap ixp425_d
vaddr_t
initarm(void *arg)
{
- extern vaddr_t xscale_cache_clean_addr;
-#ifdef DIAGNOSTIC
- extern vsize_t xscale_minidata_clean_size;
-#endif
int loop;
int loop1;
u_int kerneldatasize;
Index: src/sys/arch/evbarm/iyonix/iyonix_machdep.c
diff -u src/sys/arch/evbarm/iyonix/iyonix_machdep.c:1.4 src/sys/arch/evbarm/iyonix/iyonix_machdep.c:1.4.20.1
--- src/sys/arch/evbarm/iyonix/iyonix_machdep.c:1.4 Sat Apr 18 11:00:40 2020
+++ src/sys/arch/evbarm/iyonix/iyonix_machdep.c Sat Oct 14 06:52:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: iyonix_machdep.c,v 1.4 2020/04/18 11:00:40 skrll Exp $ */
+/* $NetBSD: iyonix_machdep.c,v 1.4.20.1 2023/10/14 06:52:17 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.4 2020/04/18 11:00:40 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.4.20.1 2023/10/14 06:52:17 martin Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -444,10 +444,6 @@ vaddr_t
initarm(void *arg)
{
struct bootconfig *passed_bootconfig = arg;
- extern vaddr_t xscale_cache_clean_addr;
-#ifdef DIAGNOSTIC
- extern vsize_t xscale_minidata_clean_size;
-#endif
extern char _end[];
int loop;
int loop1;
Index: src/sys/arch/evbarm/lubbock/lubbock_machdep.c
diff -u src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.42 src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.42.4.1
--- src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.42 Tue Aug 17 22:00:29 2021
+++ src/sys/arch/evbarm/lubbock/lubbock_machdep.c Sat Oct 14 06:52:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lubbock_machdep.c,v 1.42 2021/08/17 22:00:29 andvar Exp $ */
+/* $NetBSD: lubbock_machdep.c,v 1.42.4.1 2023/10/14 06:52:17 martin Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -112,7 +112,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.42 2021/08/17 22:00:29 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.42.4.1 2023/10/14 06:52:17 martin Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -410,16 +410,12 @@ static const struct pmap_devmap lubbock_
vaddr_t
initarm(void *arg)
{
- extern vaddr_t xscale_cache_clean_addr;
int loop;
int loop1;
u_int l1pagetable;
paddr_t memstart;
psize_t memsize;
int led_data = 0;
-#ifdef DIAGNOSTIC
- extern vsize_t xscale_minidata_clean_size; /* used in KASSERT */
-#endif
#define LEDSTEP_P() ioreg_write(LUBBOCK_OBIO_PBASE+LUBBOCK_HEXLED, led_data++)
#define LEDSTEP() hex_led(led_data++)
Index: src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
diff -u src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.29 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.29.4.1
--- src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.29 Tue Aug 17 22:00:29 2021
+++ src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c Sat Oct 14 06:52:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: npwr_fc_machdep.c,v 1.29 2021/08/17 22:00:29 andvar Exp $ */
+/* $NetBSD: npwr_fc_machdep.c,v 1.29.4.1 2023/10/14 06:52:17 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.29 2021/08/17 22:00:29 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.29.4.1 2023/10/14 06:52:17 martin Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -344,10 +344,6 @@ static const struct pmap_devmap iq80321_
vaddr_t
initarm(void *arg)
{
- extern vaddr_t xscale_cache_clean_addr;
-#ifdef DIAGNOSTIC
- extern vsize_t xscale_minidata_clean_size;
-#endif
int loop;
int loop1;
u_int l1pagetable;
Index: src/sys/arch/evbarm/nslu2/nslu2_machdep.c
diff -u src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.35 src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.35.4.1
--- src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.35 Tue Aug 17 22:00:29 2021
+++ src/sys/arch/evbarm/nslu2/nslu2_machdep.c Sat Oct 14 06:52:15 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: nslu2_machdep.c,v 1.35 2021/08/17 22:00:29 andvar Exp $ */
+/* $NetBSD: nslu2_machdep.c,v 1.35.4.1 2023/10/14 06:52:15 martin Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -94,7 +94,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.35 2021/08/17 22:00:29 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.35.4.1 2023/10/14 06:52:15 martin Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -423,10 +423,6 @@ static const struct pmap_devmap nslu2_de
vaddr_t
initarm(void *arg)
{
- extern vaddr_t xscale_cache_clean_addr;
-#ifdef DIAGNOSTIC
- extern vsize_t xscale_minidata_clean_size;
-#endif
int loop;
int loop1;
u_int kerneldatasize;
Index: src/sys/arch/evbarm/viper/viper_machdep.c
diff -u src/sys/arch/evbarm/viper/viper_machdep.c:1.33 src/sys/arch/evbarm/viper/viper_machdep.c:1.33.4.1
--- src/sys/arch/evbarm/viper/viper_machdep.c:1.33 Tue Aug 17 22:00:29 2021
+++ src/sys/arch/evbarm/viper/viper_machdep.c Sat Oct 14 06:52:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: viper_machdep.c,v 1.33 2021/08/17 22:00:29 andvar Exp $ */
+/* $NetBSD: viper_machdep.c,v 1.33.4.1 2023/10/14 06:52:17 martin Exp $ */
/*
* Startup routines for the Arcom Viper. Below you can trace the
@@ -112,7 +112,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.33 2021/08/17 22:00:29 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.33.4.1 2023/10/14 06:52:17 martin Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -381,13 +381,9 @@ static const struct pmap_devmap viper_de
vaddr_t
initarm(void *arg)
{
- extern vaddr_t xscale_cache_clean_addr;
int loop;
int loop1;
u_int l1pagetable;
-#ifdef DIAGNOSTIC
- extern vsize_t xscale_minidata_clean_size; /* used in KASSERT */
-#endif
/* Register devmap for devices we mapped in start */
pmap_devmap_register(viper_devmap);
Index: src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.30 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.30.4.1
--- src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.30 Tue Aug 17 22:00:29 2021
+++ src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c Sat Oct 14 06:52:16 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_hpc_machdep.c,v 1.30 2021/08/17 22:00:29 andvar Exp $ */
+/* $NetBSD: pxa2x0_hpc_machdep.c,v 1.30.4.1 2023/10/14 06:52:16 martin Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.30 2021/08/17 22:00:29 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.30.4.1 2023/10/14 06:52:16 martin Exp $");
#include "opt_ddb.h"
#include "opt_dram_pages.h"
@@ -236,10 +236,6 @@ read_ttb(void)
vaddr_t
init_pxa2x0(int argc, char **argv, struct bootinfo *bi)
{
-#ifdef DIAGNOSTIC
- extern vsize_t xscale_minidata_clean_size; /* used in KASSERT */
-#endif
- extern vaddr_t xscale_cache_clean_addr;
u_int kerneldatasize, symbolsize;
u_int l1pagetable;
vaddr_t freemempos;
Index: src/sys/arch/iyonix/iyonix/iyonix_machdep.c
diff -u src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.31 src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.31.4.1
--- src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.31 Sun Jan 2 16:42:10 2022
+++ src/sys/arch/iyonix/iyonix/iyonix_machdep.c Sat Oct 14 06:52:16 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: iyonix_machdep.c,v 1.31 2022/01/02 16:42:10 christos Exp $ */
+/* $NetBSD: iyonix_machdep.c,v 1.31.4.1 2023/10/14 06:52:16 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.31 2022/01/02 16:42:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.31.4.1 2023/10/14 06:52:16 martin Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -428,10 +428,6 @@ vaddr_t
initarm(void *arg)
{
struct bootconfig *passed_bootconfig = arg;
- extern vaddr_t xscale_cache_clean_addr;
-#ifdef DIAGNOSTIC
- extern vsize_t xscale_minidata_clean_size;
-#endif
extern char _end[];
int loop;
int loop1;
Index: src/sys/arch/zaurus/zaurus/machdep.c
diff -u src/sys/arch/zaurus/zaurus/machdep.c:1.50 src/sys/arch/zaurus/zaurus/machdep.c:1.50.4.1
--- src/sys/arch/zaurus/zaurus/machdep.c:1.50 Sun Jul 3 19:58:42 2022
+++ src/sys/arch/zaurus/zaurus/machdep.c Sat Oct 14 06:52:16 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.50 2022/07/03 19:58:42 andvar Exp $ */
+/* $NetBSD: machdep.c,v 1.50.4.1 2023/10/14 06:52:16 martin Exp $ */
/* $OpenBSD: zaurus_machdep.c,v 1.25 2006/06/20 18:24:04 todd Exp $ */
/*
@@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2022/07/03 19:58:42 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50.4.1 2023/10/14 06:52:16 martin Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -636,10 +636,6 @@ hw_isc1000(void)
vaddr_t
initarm(void *arg)
{
-#if defined(DIAGNOSTIC) || defined(VERBOSE_INIT_ARM)
- extern vsize_t xscale_minidata_clean_size; /* used in KASSERT */
-#endif
- extern vaddr_t xscale_cache_clean_addr;
extern char KERNEL_BASE_phys[], KERNEL_BASE_virt[];
int loop;
int loop1;
