Module Name: src
Committed By: skrll
Date: Thu Oct 12 11:33:39 UTC 2023
Modified Files:
src/sys/arch/arm/arm32: pmap.c
src/sys/arch/arm/include/arm32: pmap.h
src/sys/arch/evbarm/adi_brh: brh_machdep.c
src/sys/arch/evbarm/g42xxeb: g42xxeb_machdep.c
src/sys/arch/evbarm/gumstix: gumstix_machdep.c
src/sys/arch/evbarm/hdl_g: hdlg_machdep.c
src/sys/arch/evbarm/iq80310: iq80310_machdep.c
src/sys/arch/evbarm/iq80321: iq80321_machdep.c
src/sys/arch/evbarm/ixdp425: ixdp425_machdep.c
src/sys/arch/evbarm/iyonix: iyonix_machdep.c
src/sys/arch/evbarm/lubbock: lubbock_machdep.c
src/sys/arch/evbarm/npwr_fc: npwr_fc_machdep.c
src/sys/arch/evbarm/nslu2: nslu2_machdep.c
src/sys/arch/evbarm/viper: viper_machdep.c
src/sys/arch/hpcarm/hpcarm: pxa2x0_hpc_machdep.c
src/sys/arch/iyonix/iyonix: iyonix_machdep.c
src/sys/arch/zaurus/zaurus: machdep.c
Log Message:
Fix non-DIAGNOSTIC builds
To generate a diff of this commit:
cvs rdiff -u -r1.439 -r1.440 src/sys/arch/arm/arm32/pmap.c
cvs rdiff -u -r1.176 -r1.177 src/sys/arch/arm/include/arm32/pmap.h
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/evbarm/adi_brh/brh_machdep.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/evbarm/gumstix/gumstix_machdep.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/evbarm/iq80310/iq80310_machdep.c
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbarm/iq80321/iq80321_machdep.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/iyonix/iyonix_machdep.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/evbarm/lubbock/lubbock_machdep.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbarm/nslu2/nslu2_machdep.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/viper/viper_machdep.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/iyonix/iyonix/iyonix_machdep.c
cvs rdiff -u -r1.51 -r1.52 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.439 src/sys/arch/arm/arm32/pmap.c:1.440
--- src/sys/arch/arm/arm32/pmap.c:1.439 Thu Apr 20 08:28:03 2023
+++ src/sys/arch/arm/arm32/pmap.c Thu Oct 12 11:33:37 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.439 2023/04/20 08:28:03 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.440 2023/10/12 11:33:37 skrll Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -193,7 +193,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.439 2023/04/20 08:28:03 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.440 2023/10/12 11:33:37 skrll Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -7594,8 +7594,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.176 src/sys/arch/arm/include/arm32/pmap.h:1.177
--- src/sys/arch/arm/include/arm32/pmap.h:1.176 Wed Aug 2 15:57:21 2023
+++ src/sys/arch/arm/include/arm32/pmap.h Thu Oct 12 11:33:37 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.176 2023/08/02 15:57:21 skrll Exp $ */
+/* $NetBSD: pmap.h,v 1.177 2023/10/12 11:33:37 skrll Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -727,6 +727,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.52 src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.53
--- src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.52 Thu Apr 20 08:28:03 2023
+++ src/sys/arch/evbarm/adi_brh/brh_machdep.c Thu Oct 12 11:33:37 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: brh_machdep.c,v 1.52 2023/04/20 08:28:03 skrll Exp $ */
+/* $NetBSD: brh_machdep.c,v 1.53 2023/10/12 11:33:37 skrll 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.52 2023/04/20 08:28:03 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.53 2023/10/12 11:33:37 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -327,10 +327,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.40 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.41
--- src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.40 Thu Apr 20 08:28:03 2023
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c Thu Oct 12 11:33:37 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: g42xxeb_machdep.c,v 1.40 2023/04/20 08:28:03 skrll Exp $ */
+/* $NetBSD: g42xxeb_machdep.c,v 1.41 2023/10/12 11:33:37 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2004, 2005 Genetec Corporation.
@@ -385,16 +385,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.74 src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.75
--- src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.74 Thu Aug 3 08:16:30 2023
+++ src/sys/arch/evbarm/gumstix/gumstix_machdep.c Thu Oct 12 11:33:37 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: gumstix_machdep.c,v 1.74 2023/08/03 08:16:30 mrg Exp $ */
+/* $NetBSD: gumstix_machdep.c,v 1.75 2023/10/12 11:33:37 skrll Exp $ */
/*
* Copyright (C) 2005, 2006, 2007 WIDE Project and SOUM Corporation.
* All rights reserved.
@@ -359,7 +359,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.34 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.35
--- src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.34 Thu Apr 20 08:28:04 2023
+++ src/sys/arch/evbarm/hdl_g/hdlg_machdep.c Thu Oct 12 11:33:38 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: hdlg_machdep.c,v 1.34 2023/04/20 08:28:04 skrll Exp $ */
+/* $NetBSD: hdlg_machdep.c,v 1.35 2023/10/12 11:33:38 skrll 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.34 2023/04/20 08:28:04 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.35 2023/10/12 11:33:38 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -215,8 +215,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.95 src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.96
--- src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.95 Thu Apr 20 08:28:04 2023
+++ src/sys/arch/evbarm/iq80310/iq80310_machdep.c Thu Oct 12 11:33:38 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_machdep.c,v 1.95 2023/04/20 08:28:04 skrll Exp $ */
+/* $NetBSD: iq80310_machdep.c,v 1.96 2023/10/12 11:33:38 skrll 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.95 2023/04/20 08:28:04 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.96 2023/10/12 11:33:38 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -303,10 +303,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.65 src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.66
--- src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.65 Thu Apr 20 08:28:04 2023
+++ src/sys/arch/evbarm/iq80321/iq80321_machdep.c Thu Oct 12 11:33:38 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80321_machdep.c,v 1.65 2023/04/20 08:28:04 skrll Exp $ */
+/* $NetBSD: iq80321_machdep.c,v 1.66 2023/10/12 11:33:38 skrll 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.65 2023/04/20 08:28:04 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.66 2023/10/12 11:33:38 skrll Exp $");
#include "opt_console.h"
#include "opt_ddb.h"
@@ -353,10 +353,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.47
--- 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 Thu Oct 12 11:33:38 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.47 2023/10/12 11:33:38 skrll 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.47 2023/10/12 11:33:38 skrll 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.5
--- 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 Thu Oct 12 11:33:38 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.5 2023/10/12 11:33:38 skrll 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.5 2023/10/12 11:33:38 skrll 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.44 src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.45
--- src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.44 Mon Jun 19 03:59:24 2023
+++ src/sys/arch/evbarm/lubbock/lubbock_machdep.c Thu Oct 12 11:33:38 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lubbock_machdep.c,v 1.44 2023/06/19 03:59:24 nisimura Exp $ */
+/* $NetBSD: lubbock_machdep.c,v 1.45 2023/10/12 11:33:38 skrll 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.44 2023/06/19 03:59:24 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.45 2023/10/12 11:33:38 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -398,16 +398,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.30
--- 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 Thu Oct 12 11:33:38 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.30 2023/10/12 11:33:38 skrll 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.30 2023/10/12 11:33:38 skrll 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.40 src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.41
--- src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.40 Sat Jun 17 11:28:13 2023
+++ src/sys/arch/evbarm/nslu2/nslu2_machdep.c Thu Oct 12 11:33:38 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: nslu2_machdep.c,v 1.40 2023/06/17 11:28:13 rin Exp $ */
+/* $NetBSD: nslu2_machdep.c,v 1.41 2023/10/12 11:33:38 skrll 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.40 2023/06/17 11:28:13 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.41 2023/10/12 11:33:38 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -412,10 +412,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.34
--- 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 Thu Oct 12 11:33:38 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.34 2023/10/12 11:33:38 skrll 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.34 2023/10/12 11:33:38 skrll 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.32 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.33
--- src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.32 Thu Aug 3 08:16:31 2023
+++ src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c Thu Oct 12 11:33:39 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_hpc_machdep.c,v 1.32 2023/08/03 08:16:31 mrg Exp $ */
+/* $NetBSD: pxa2x0_hpc_machdep.c,v 1.33 2023/10/12 11:33:39 skrll 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.32 2023/08/03 08:16:31 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.33 2023/10/12 11:33:39 skrll Exp $");
#include "opt_ddb.h"
#include "opt_dram_pages.h"
@@ -225,10 +225,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.33 src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.34
--- src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.33 Wed Sep 13 19:45:37 2023
+++ src/sys/arch/iyonix/iyonix/iyonix_machdep.c Thu Oct 12 11:33:39 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: iyonix_machdep.c,v 1.33 2023/09/13 19:45:37 andvar Exp $ */
+/* $NetBSD: iyonix_machdep.c,v 1.34 2023/10/12 11:33:39 skrll 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.33 2023/09/13 19:45:37 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.34 2023/10/12 11:33:39 skrll Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -414,10 +414,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.51 src/sys/arch/zaurus/zaurus/machdep.c:1.52
--- src/sys/arch/zaurus/zaurus/machdep.c:1.51 Thu Apr 20 08:28:06 2023
+++ src/sys/arch/zaurus/zaurus/machdep.c Thu Oct 12 11:33:39 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.51 2023/04/20 08:28:06 skrll Exp $ */
+/* $NetBSD: machdep.c,v 1.52 2023/10/12 11:33:39 skrll 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.51 2023/04/20 08:28:06 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.52 2023/10/12 11:33:39 skrll Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -620,10 +620,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;
