Module Name: src
Committed By: skrll
Date: Tue Jul 16 14:41:49 UTC 2019
Modified Files:
src/sys/arch/acorn32/acorn32: rpc_machdep.c
src/sys/arch/acorn32/eb7500atx: eb7500atx_machdep.c
src/sys/arch/arm/at91: at91bus.c at91busvar.h
src/sys/arch/arm/include/arm32: machdep.h
src/sys/arch/arm/ofw: ofwgencfg_machdep.c
src/sys/arch/cats/cats: cats_machdep.c
src/sys/arch/epoc32/epoc32: machdep.c
src/sys/arch/evbarm/adi_brh: brh_machdep.c
src/sys/arch/evbarm/armadaxp: armadaxp_machdep.c
src/sys/arch/evbarm/armadillo: armadillo9_machdep.c
src/sys/arch/evbarm/bcm53xx: bcm53xx_machdep.c
src/sys/arch/evbarm/beagle: beagle_machdep.c
src/sys/arch/evbarm/fdt: fdt_machdep.c
src/sys/arch/evbarm/g42xxeb: g42xxeb_machdep.c
src/sys/arch/evbarm/gemini: gemini_machdep.c
src/sys/arch/evbarm/gumstix: gumstix_machdep.c
src/sys/arch/evbarm/hawk: hawk_machdep.c
src/sys/arch/evbarm/hdl_g: hdlg_machdep.c
src/sys/arch/evbarm/imx23_olinuxino: imx23_olinuxino_machdep.c
src/sys/arch/evbarm/imx31: imx31lk_machdep.c
src/sys/arch/evbarm/imx7: imx7_machdep.c
src/sys/arch/evbarm/integrator: integrator_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/ixm1200: ixm1200_machdep.c
src/sys/arch/evbarm/iyonix: iyonix_machdep.c
src/sys/arch/evbarm/kobo: kobo_machdep.c
src/sys/arch/evbarm/lubbock: lubbock_machdep.c
src/sys/arch/evbarm/marvell: marvell_machdep.c
src/sys/arch/evbarm/mini2440: mini2440_machdep.c
src/sys/arch/evbarm/mmnet: mmnet_machdep.c
src/sys/arch/evbarm/mpcsa: mpcsa_machdep.c
src/sys/arch/evbarm/netwalker: netwalker_machdep.c
src/sys/arch/evbarm/nitrogen6: nitrogen6_machdep.c
src/sys/arch/evbarm/npwr_fc: npwr_fc_machdep.c
src/sys/arch/evbarm/nslu2: nslu2_machdep.c
src/sys/arch/evbarm/osk5912: osk5912_machdep.c
src/sys/arch/evbarm/smdk2xx0: smdk2410_machdep.c smdk2800_machdep.c
src/sys/arch/evbarm/tisdp24xx: sdp24xx_machdep.c
src/sys/arch/evbarm/tsarm: tsarm_machdep.c
src/sys/arch/evbarm/viper: viper_machdep.c
src/sys/arch/evbarm/zynq: zynq_machdep.c
src/sys/arch/hpcarm/hpcarm: hpc_machdep.c pxa2x0_hpc_machdep.c
sa11x0_hpc_machdep.c
src/sys/arch/iyonix/iyonix: iyonix_machdep.c
src/sys/arch/netwinder/netwinder: netwinder_machdep.c
src/sys/arch/shark/shark: shark_machdep.c
src/sys/arch/zaurus/zaurus: machdep.c
Log Message:
Consistently use vaddr_t as initarm and friends return type.
Makes no difference to binaries except for aarch64 where it's required
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/acorn32/acorn32/rpc_machdep.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/at91/at91bus.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/at91/at91busvar.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/include/arm32/machdep.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/ofw/ofwgencfg_machdep.c
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/cats/cats/cats_machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/epoc32/epoc32/machdep.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/evbarm/adi_brh/brh_machdep.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/evbarm/beagle/beagle_machdep.c
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/evbarm/fdt/fdt_machdep.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/gemini/gemini_machdep.c
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/evbarm/gumstix/gumstix_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/hawk/hawk_machdep.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c
cvs rdiff -u -r1.8 -r1.9 \
src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/imx31/imx31lk_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/imx7/imx7_machdep.c
cvs rdiff -u -r1.76 -r1.77 \
src/sys/arch/evbarm/integrator/integrator_machdep.c
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/evbarm/iq80310/iq80310_machdep.c
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/evbarm/iq80321/iq80321_machdep.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/iyonix/iyonix_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/kobo/kobo_machdep.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/lubbock/lubbock_machdep.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/marvell/marvell_machdep.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/mini2440/mini2440_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/mmnet/mmnet_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/netwalker/netwalker_machdep.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbarm/nslu2/nslu2_machdep.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/osk5912/osk5912_machdep.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/tsarm/tsarm_machdep.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/viper/viper_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/zynq/zynq_machdep.c
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/iyonix/iyonix/iyonix_machdep.c
cvs rdiff -u -r1.87 -r1.88 \
src/sys/arch/netwinder/netwinder/netwinder_machdep.c
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/shark/shark/shark_machdep.c
cvs rdiff -u -r1.41 -r1.42 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/acorn32/acorn32/rpc_machdep.c
diff -u src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.92 src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.93
--- src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.92 Sun Oct 28 14:30:30 2018
+++ src/sys/arch/acorn32/acorn32/rpc_machdep.c Tue Jul 16 14:41:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc_machdep.c,v 1.92 2018/10/28 14:30:30 skrll Exp $ */
+/* $NetBSD: rpc_machdep.c,v 1.93 2019/07/16 14:41:43 skrll Exp $ */
/*
* Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -55,7 +55,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.92 2018/10/28 14:30:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.93 2019/07/16 14:41:43 skrll Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -392,7 +392,7 @@ canonicalise_bootconfig(struct bootconfi
}
-u_int
+vaddr_t
initarm(void *cookie)
{
struct bootconfig *raw_bootconf = cookie;
Index: src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
diff -u src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.30 src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.31
--- src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.30 Sun Oct 28 14:30:30 2018
+++ src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c Tue Jul 16 14:41:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: eb7500atx_machdep.c,v 1.30 2018/10/28 14:30:30 skrll Exp $ */
+/* $NetBSD: eb7500atx_machdep.c,v 1.31 2019/07/16 14:41:43 skrll Exp $ */
/*
* Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -55,7 +55,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.30 2018/10/28 14:30:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.31 2019/07/16 14:41:43 skrll Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -359,7 +359,7 @@ canonicalise_bootconfig(struct bootconfi
}
-u_int
+vaddr_t
initarm(void *cookie)
{
struct bootconfig *raw_bootconf = cookie;
Index: src/sys/arch/arm/at91/at91bus.c
diff -u src/sys/arch/arm/at91/at91bus.c:1.24 src/sys/arch/arm/at91/at91bus.c:1.25
--- src/sys/arch/arm/at91/at91bus.c:1.24 Tue Jul 16 09:25:55 2019
+++ src/sys/arch/arm/at91/at91bus.c Tue Jul 16 14:41:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: at91bus.c,v 1.24 2019/07/16 09:25:55 skrll Exp $ */
+/* $NetBSD: at91bus.c,v 1.25 2019/07/16 14:41:43 skrll Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.24 2019/07/16 09:25:55 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.25 2019/07/16 14:41:43 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -232,7 +232,7 @@ at91bus_init(void)
return 0;
}
-u_int
+vaddr_t
at91bus_setup(BootConfig *mem)
{
int loop;
Index: src/sys/arch/arm/at91/at91busvar.h
diff -u src/sys/arch/arm/at91/at91busvar.h:1.6 src/sys/arch/arm/at91/at91busvar.h:1.7
--- src/sys/arch/arm/at91/at91busvar.h:1.6 Mon Nov 12 18:00:36 2012
+++ src/sys/arch/arm/at91/at91busvar.h Tue Jul 16 14:41:43 2019
@@ -1,5 +1,5 @@
-/* $Id: at91busvar.h,v 1.6 2012/11/12 18:00:36 skrll Exp $ */
-/* $NetBSD: at91busvar.h,v 1.6 2012/11/12 18:00:36 skrll Exp $ */
+/* $Id: at91busvar.h,v 1.7 2019/07/16 14:41:43 skrll Exp $ */
+/* $NetBSD: at91busvar.h,v 1.7 2019/07/16 14:41:43 skrll Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -117,7 +117,7 @@ extern struct arm32_bus_dma_tag at91_bd_
extern int at91bus_init(void);
struct _BootConfig;
-extern u_int at91bus_setup(struct _BootConfig *);
+extern vaddr_t at91bus_setup(struct _BootConfig *);
extern bus_dma_tag_t at91_bus_dma_init(struct arm32_bus_dma_tag *);
static __inline const struct pmap_devmap *
Index: src/sys/arch/arm/include/arm32/machdep.h
diff -u src/sys/arch/arm/include/arm32/machdep.h:1.28 src/sys/arch/arm/include/arm32/machdep.h:1.29
--- src/sys/arch/arm/include/arm32/machdep.h:1.28 Thu Jan 3 10:26:41 2019
+++ src/sys/arch/arm/include/arm32/machdep.h Tue Jul 16 14:41:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.h,v 1.28 2019/01/03 10:26:41 skrll Exp $ */
+/* $NetBSD: machdep.h,v 1.29 2019/07/16 14:41:43 skrll Exp $ */
#ifndef _ARM32_MACHDEP_H_
#define _ARM32_MACHDEP_H_
@@ -69,7 +69,7 @@ void dumpsys(void);
* note that we use void * as all the platforms have different ideas on what
* the structure is
*/
-u_int initarm(void *);
+vaddr_t initarm(void *);
struct pmap_devmap;
struct boot_physmem;
Index: src/sys/arch/arm/ofw/ofwgencfg_machdep.c
diff -u src/sys/arch/arm/ofw/ofwgencfg_machdep.c:1.19 src/sys/arch/arm/ofw/ofwgencfg_machdep.c:1.20
--- src/sys/arch/arm/ofw/ofwgencfg_machdep.c:1.19 Sat Oct 27 17:17:40 2012
+++ src/sys/arch/arm/ofw/ofwgencfg_machdep.c Tue Jul 16 14:41:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ofwgencfg_machdep.c,v 1.19 2012/10/27 17:17:40 chs Exp $ */
+/* $NetBSD: ofwgencfg_machdep.c,v 1.20 2019/07/16 14:41:44 skrll Exp $ */
/*
* Copyright 1997
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofwgencfg_machdep.c,v 1.19 2012/10/27 17:17:40 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofwgencfg_machdep.c,v 1.20 2019/07/16 14:41:44 skrll Exp $");
#include "opt_ddb.h"
@@ -146,7 +146,7 @@ cpu_reboot(int howto, char *bootstr)
* Return the new stackptr (va) for the SVC frame.
*
*/
-u_int
+vaddr_t
initarm(void *cookie)
{
ofw_handle_t ofw_handle = cookie;
Index: src/sys/arch/cats/cats/cats_machdep.c
diff -u src/sys/arch/cats/cats/cats_machdep.c:1.87 src/sys/arch/cats/cats/cats_machdep.c:1.88
--- src/sys/arch/cats/cats/cats_machdep.c:1.87 Fri Apr 26 07:32:40 2019
+++ src/sys/arch/cats/cats/cats_machdep.c Tue Jul 16 14:41:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cats_machdep.c,v 1.87 2019/04/26 07:32:40 skrll Exp $ */
+/* $NetBSD: cats_machdep.c,v 1.88 2019/07/16 14:41:44 skrll Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.87 2019/04/26 07:32:40 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.88 2019/07/16 14:41:44 skrll Exp $");
#include "opt_ddb.h"
#include "opt_modular.h"
@@ -218,7 +218,7 @@ extern struct bus_space footbridge_pci_m
void footbridge_pci_bs_tag_init(void);
/*
- * u_int initarm(struct ebsaboot *bootinfo)
+ * vaddr_t initarm(struct ebsaboot *bootinfo)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -231,7 +231,7 @@ void footbridge_pci_bs_tag_init(void);
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arm_bootargs)
{
struct ebsaboot *bootinfo = arm_bootargs;
@@ -467,7 +467,7 @@ initarm(void *arm_bootargs)
cpu_reset_address_paddr = DC21285_ROM_BASE;
/* initarm_common returns the new stack pointer address */
- u_int sp;
+ vaddr_t sp;
sp = initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, cats_physmem,
ncats_physmem);
Index: src/sys/arch/epoc32/epoc32/machdep.c
diff -u src/sys/arch/epoc32/epoc32/machdep.c:1.7 src/sys/arch/epoc32/epoc32/machdep.c:1.8
--- src/sys/arch/epoc32/epoc32/machdep.c:1.7 Sun Oct 28 14:30:31 2018
+++ src/sys/arch/epoc32/epoc32/machdep.c Tue Jul 16 14:41:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.7 2018/10/28 14:30:31 skrll Exp $ */
+/* $NetBSD: machdep.c,v 1.8 2019/07/16 14:41:44 skrll Exp $ */
/*
* Copyright (c) 2012, 2013 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.7 2018/10/28 14:30:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.8 2019/07/16 14:41:44 skrll Exp $");
#include "clpscom.h"
#include "clpslcd.h"
@@ -149,7 +149,7 @@ static const struct pmap_devmap epoc32_f
};
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -161,7 +161,7 @@ static const struct pmap_devmap epoc32_f
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
extern char _end[];
Index: src/sys/arch/evbarm/adi_brh/brh_machdep.c
diff -u src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.47 src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.48
--- src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.47 Sun Oct 28 14:30:31 2018
+++ src/sys/arch/evbarm/adi_brh/brh_machdep.c Tue Jul 16 14:41:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: brh_machdep.c,v 1.47 2018/10/28 14:30:31 skrll Exp $ */
+/* $NetBSD: brh_machdep.c,v 1.48 2019/07/16 14:41:44 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.47 2018/10/28 14:30:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.48 2019/07/16 14:41:44 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -339,7 +339,7 @@ brh_hardclock_hook(void)
}
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -351,7 +351,7 @@ brh_hardclock_hook(void)
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
extern vaddr_t xscale_cache_clean_addr;
Index: src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c
diff -u src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c:1.16 src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c:1.17
--- src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c:1.16 Fri Sep 21 12:04:07 2018
+++ src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c Tue Jul 16 14:41:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: armadaxp_machdep.c,v 1.16 2018/09/21 12:04:07 skrll Exp $ */
+/* $NetBSD: armadaxp_machdep.c,v 1.17 2019/07/16 14:41:44 skrll Exp $ */
/*******************************************************************************
Copyright (C) Marvell International Ltd. and its affiliates
@@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
*******************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadaxp_machdep.c,v 1.16 2018/09/21 12:04:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadaxp_machdep.c,v 1.17 2019/07/16 14:41:44 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -309,7 +309,7 @@ reset_axp_pcie_win(void)
}
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -321,7 +321,7 @@ reset_axp_pcie_win(void)
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
cpu_reset_address = axp_system_reset;
Index: src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
diff -u src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.33 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.34
--- src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.33 Tue Jul 16 09:25:55 2019
+++ src/sys/arch/evbarm/armadillo/armadillo9_machdep.c Tue Jul 16 14:41:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: armadillo9_machdep.c,v 1.33 2019/07/16 09:25:55 skrll Exp $ */
+/* $NetBSD: armadillo9_machdep.c,v 1.34 2019/07/16 14:41:44 skrll Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.33 2019/07/16 09:25:55 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.34 2019/07/16 14:41:44 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -447,7 +447,7 @@ static const struct pmap_devmap armadill
};
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -459,7 +459,7 @@ static const struct pmap_devmap armadill
* Setting up page tables for the kernel
* Initialising interrupt controllers to a sane default state
*/
-u_int
+vaddr_t
initarm(void *arg)
{
int loop;
Index: src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c
diff -u src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.20 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.21
--- src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.20 Sat May 18 08:49:23 2019
+++ src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c Tue Jul 16 14:41:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm53xx_machdep.c,v 1.20 2019/05/18 08:49:23 skrll Exp $ */
+/* $NetBSD: bcm53xx_machdep.c,v 1.21 2019/07/16 14:41:44 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#define IDM_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm53xx_machdep.c,v 1.20 2019/05/18 08:49:23 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm53xx_machdep.c,v 1.21 2019/07/16 14:41:44 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -268,7 +268,7 @@ bcm53xx_mpstart(void)
}
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -279,7 +279,7 @@ bcm53xx_mpstart(void)
* Initialising the physical console so characters can be printed.
* Setting up page tables for the kernel
*/
-u_int
+vaddr_t
initarm(void *arg)
{
/*
@@ -388,7 +388,7 @@ initarm(void *arg)
* If we have more than 256MB of RAM, set aside the first 256MB for
* non-default VM allocations.
*/
- u_int sp = initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE,
+ vaddr_t sp = initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE,
(bigmem_p ? &bp_first256 : NULL), (bigmem_p ? 1 : 0));
/*
Index: src/sys/arch/evbarm/beagle/beagle_machdep.c
diff -u src/sys/arch/evbarm/beagle/beagle_machdep.c:1.77 src/sys/arch/evbarm/beagle/beagle_machdep.c:1.78
--- src/sys/arch/evbarm/beagle/beagle_machdep.c:1.77 Sat May 18 08:49:23 2019
+++ src/sys/arch/evbarm/beagle/beagle_machdep.c Tue Jul 16 14:41:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: beagle_machdep.c,v 1.77 2019/05/18 08:49:23 skrll Exp $ */
+/* $NetBSD: beagle_machdep.c,v 1.78 2019/07/16 14:41:44 skrll Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.77 2019/05/18 08:49:23 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.78 2019/07/16 14:41:44 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -557,7 +557,7 @@ beagle_platform_early_putchar(char c)
#endif
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -569,7 +569,7 @@ beagle_platform_early_putchar(char c)
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
psize_t ram_size = 0;
@@ -725,7 +725,7 @@ initarm(void *arg)
db_trap_callback = beagle_db_trap;
- u_int sp = initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, NULL, 0);
+ vaddr_t sp = initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, NULL, 0);
/*
* initarm_common flushes cache if required before AP start
Index: src/sys/arch/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.63 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.64
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.63 Mon Jul 15 08:44:33 2019
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Tue Jul 16 14:41:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.63 2019/07/15 08:44:33 skrll Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.64 2019/07/16 14:41:45 skrll Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.63 2019/07/15 08:44:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.64 2019/07/16 14:41:45 skrll Exp $");
#include "opt_machdep.h"
#include "opt_bootconfig.h"
@@ -416,9 +416,7 @@ fdt_map_efi_runtime(const char *prop, en
}
#endif
-u_int initarm(void *arg);
-
-u_int
+vaddr_t
initarm(void *arg)
{
const struct arm_platform *plat;
@@ -543,7 +541,7 @@ initarm(void *arg)
VPRINTF("Memory regions:\n");
fdt_memory_foreach(fdt_add_boot_physmem, &memory_size);
- u_int sp = initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, fdt_physmem,
+ vaddr_t sp = initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, fdt_physmem,
nfdt_physmem);
/*
Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.34 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.35
--- src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.34 Tue Jul 16 09:25:55 2019
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c Tue Jul 16 14:41:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: g42xxeb_machdep.c,v 1.34 2019/07/16 09:25:55 skrll Exp $ */
+/* $NetBSD: g42xxeb_machdep.c,v 1.35 2019/07/16 14:41:45 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2004, 2005 Genetec Corporation.
@@ -388,7 +388,7 @@ static const struct pmap_devmap g42xxeb_
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -400,7 +400,7 @@ static const struct pmap_devmap g42xxeb_
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
extern vaddr_t xscale_cache_clean_addr;
Index: src/sys/arch/evbarm/gemini/gemini_machdep.c
diff -u src/sys/arch/evbarm/gemini/gemini_machdep.c:1.30 src/sys/arch/evbarm/gemini/gemini_machdep.c:1.31
--- src/sys/arch/evbarm/gemini/gemini_machdep.c:1.30 Tue Jul 16 09:25:56 2019
+++ src/sys/arch/evbarm/gemini/gemini_machdep.c Tue Jul 16 14:41:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_machdep.c,v 1.30 2019/07/16 09:25:56 skrll Exp $ */
+/* $NetBSD: gemini_machdep.c,v 1.31 2019/07/16 14:41:45 skrll Exp $ */
/* adapted from:
* NetBSD: sdp24xx_machdep.c,v 1.4 2008/08/27 11:03:10 matt Exp
@@ -129,7 +129,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.30 2019/07/16 09:25:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.31 2019/07/16 14:41:45 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -556,7 +556,7 @@ gemini_puthex(unsigned int val)
#endif /* VERBOSE_INIT_ARM */
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -568,7 +568,7 @@ gemini_puthex(unsigned int val)
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
GEMINI_PUTCHAR('0');
Index: src/sys/arch/evbarm/gumstix/gumstix_machdep.c
diff -u src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.62 src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.63
--- src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.62 Sat May 18 08:49:24 2019
+++ src/sys/arch/evbarm/gumstix/gumstix_machdep.c Tue Jul 16 14:41:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gumstix_machdep.c,v 1.62 2019/05/18 08:49:24 skrll Exp $ */
+/* $NetBSD: gumstix_machdep.c,v 1.63 2019/07/16 14:41:45 skrll Exp $ */
/*
* Copyright (C) 2005, 2006, 2007 WIDE Project and SOUM Corporation.
* All rights reserved.
@@ -565,7 +565,7 @@ extern uint32_t *uboot_args;
#endif
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -577,7 +577,7 @@ extern uint32_t *uboot_args;
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
extern char KERNEL_BASE_phys[];
@@ -778,7 +778,7 @@ initarm(void *arg)
evbarm_device_register = gumstix_device_register;
- u_int sp = initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, NULL, 0);
+ vaddr_t sp = initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, NULL, 0);
/*
* initarm_common flushes cache if required before AP start
Index: src/sys/arch/evbarm/hawk/hawk_machdep.c
diff -u src/sys/arch/evbarm/hawk/hawk_machdep.c:1.4 src/sys/arch/evbarm/hawk/hawk_machdep.c:1.5
--- src/sys/arch/evbarm/hawk/hawk_machdep.c:1.4 Fri Sep 21 12:04:08 2018
+++ src/sys/arch/evbarm/hawk/hawk_machdep.c Tue Jul 16 14:41:45 2019
@@ -26,7 +26,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hawk_machdep.c,v 1.4 2018/09/21 12:04:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hawk_machdep.c,v 1.5 2019/07/16 14:41:45 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -286,7 +286,7 @@ hawk_device_register (device_t self, voi
}
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -298,7 +298,7 @@ hawk_device_register (device_t self, voi
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
vaddr_t addr;
Index: src/sys/arch/evbarm/hdl_g/hdlg_machdep.c
diff -u src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.27 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.28
--- src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.27 Tue Jul 16 09:25:56 2019
+++ src/sys/arch/evbarm/hdl_g/hdlg_machdep.c Tue Jul 16 14:41:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hdlg_machdep.c,v 1.27 2019/07/16 09:25:56 skrll Exp $ */
+/* $NetBSD: hdlg_machdep.c,v 1.28 2019/07/16 14:41:45 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.27 2019/07/16 09:25:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.28 2019/07/16 14:41:45 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -217,7 +217,7 @@ hardclock_hook(void)
}
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -229,7 +229,7 @@ hardclock_hook(void)
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
extern vaddr_t xscale_cache_clean_addr;
Index: src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c
diff -u src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.8 src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.9
--- src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.8 Sun Aug 12 20:13:13 2018
+++ src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c Tue Jul 16 14:41:45 2019
@@ -1,4 +1,4 @@
-/* $Id: imx23_olinuxino_machdep.c,v 1.8 2018/08/12 20:13:13 skrll Exp $ */
+/* $Id: imx23_olinuxino_machdep.c,v 1.9 2019/07/16 14:41:45 skrll Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@ static void bypass_ssp(void);
/*
* Initialize ARM and return new SVC stack pointer.
*/
-u_int
+vaddr_t
initarm(void *arg)
{
psize_t ram_size;
Index: src/sys/arch/evbarm/imx31/imx31lk_machdep.c
diff -u src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.25 src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.26
--- src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.25 Tue Jul 16 09:25:56 2019
+++ src/sys/arch/evbarm/imx31/imx31lk_machdep.c Tue Jul 16 14:41:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: imx31lk_machdep.c,v 1.25 2019/07/16 09:25:56 skrll Exp $ */
+/* $NetBSD: imx31lk_machdep.c,v 1.26 2019/07/16 14:41:45 skrll Exp $ */
/*
* Startup routines for the ZOOM iMX31 LITEKIT.
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.25 2019/07/16 09:25:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.26 2019/07/16 14:41:45 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -329,7 +329,7 @@ static const struct pmap_devmap imx31lk_
#endif
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -341,7 +341,7 @@ static const struct pmap_devmap imx31lk_
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
int loop;
Index: src/sys/arch/evbarm/imx7/imx7_machdep.c
diff -u src/sys/arch/evbarm/imx7/imx7_machdep.c:1.10 src/sys/arch/evbarm/imx7/imx7_machdep.c:1.11
--- src/sys/arch/evbarm/imx7/imx7_machdep.c:1.10 Sat May 18 08:49:24 2019
+++ src/sys/arch/evbarm/imx7/imx7_machdep.c Tue Jul 16 14:41:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: imx7_machdep.c,v 1.10 2019/05/18 08:49:24 skrll Exp $ */
+/* $NetBSD: imx7_machdep.c,v 1.11 2019/07/16 14:41:46 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx7_machdep.c,v 1.10 2019/05/18 08:49:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx7_machdep.c,v 1.11 2019/07/16 14:41:46 skrll Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_arm_debug.h"
@@ -233,7 +233,7 @@ imx7_mpstart(void)
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -244,7 +244,7 @@ imx7_mpstart(void)
* Initialising the physical console so characters can be printed.
* Setting up page tables for the kernel
*/
-u_int
+vaddr_t
initarm(void *arg)
{
psize_t memsize;
@@ -358,7 +358,7 @@ initarm(void *arg)
&bp_highgig, 1);
}
#endif
- u_int sp = initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, NULL, 0);
+ vaddr_t sp = initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, NULL, 0);
/*
* initarm_common flushes cache if required before AP start
Index: src/sys/arch/evbarm/integrator/integrator_machdep.c
diff -u src/sys/arch/evbarm/integrator/integrator_machdep.c:1.76 src/sys/arch/evbarm/integrator/integrator_machdep.c:1.77
--- src/sys/arch/evbarm/integrator/integrator_machdep.c:1.76 Fri Sep 21 12:04:09 2018
+++ src/sys/arch/evbarm/integrator/integrator_machdep.c Tue Jul 16 14:41:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: integrator_machdep.c,v 1.76 2018/09/21 12:04:09 skrll Exp $ */
+/* $NetBSD: integrator_machdep.c,v 1.77 2019/07/16 14:41:46 skrll Exp $ */
/*
* Copyright (c) 2001,2002 ARM Ltd
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.76 2018/09/21 12:04:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.77 2019/07/16 14:41:46 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -309,7 +309,7 @@ static const struct pmap_devmap integrat
};
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -322,7 +322,7 @@ static const struct pmap_devmap integrat
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
extern int KERNEL_BASE_phys[];
Index: src/sys/arch/evbarm/iq80310/iq80310_machdep.c
diff -u src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.90 src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.91
--- src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.90 Fri Mar 1 09:25:59 2019
+++ src/sys/arch/evbarm/iq80310/iq80310_machdep.c Tue Jul 16 14:41:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_machdep.c,v 1.90 2019/03/01 09:25:59 msaitoh Exp $ */
+/* $NetBSD: iq80310_machdep.c,v 1.91 2019/07/16 14:41:46 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.90 2019/03/01 09:25:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.91 2019/07/16 14:41:46 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -307,7 +307,7 @@ static const struct pmap_devmap iq80310_
};
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -319,7 +319,7 @@ static const struct pmap_devmap iq80310_
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
extern vaddr_t xscale_cache_clean_addr;
Index: src/sys/arch/evbarm/iq80321/iq80321_machdep.c
diff -u src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.60 src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.61
--- src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.60 Tue Jul 16 09:25:56 2019
+++ src/sys/arch/evbarm/iq80321/iq80321_machdep.c Tue Jul 16 14:41:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80321_machdep.c,v 1.60 2019/07/16 09:25:56 skrll Exp $ */
+/* $NetBSD: iq80321_machdep.c,v 1.61 2019/07/16 14:41:46 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.60 2019/07/16 09:25:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.61 2019/07/16 14:41:46 skrll Exp $");
#include "opt_console.h"
#include "opt_ddb.h"
@@ -355,7 +355,7 @@ iq80321_hardclock_hook(void)
}
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -367,7 +367,7 @@ iq80321_hardclock_hook(void)
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
extern vaddr_t xscale_cache_clean_addr;
Index: src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
diff -u src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.42 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.43
--- src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.42 Tue Jul 16 09:25:56 2019
+++ src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c Tue Jul 16 14:41:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ixdp425_machdep.c,v 1.42 2019/07/16 09:25:56 skrll Exp $ */
+/* $NetBSD: ixdp425_machdep.c,v 1.43 2019/07/16 14:41:46 skrll Exp $ */
/*
* Copyright (c) 2003
* Ichiro FUKUHARA <[email protected]>.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.42 2019/07/16 09:25:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.43 2019/07/16 14:41:46 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -360,7 +360,7 @@ static const struct pmap_devmap ixp425_d
};
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -372,7 +372,7 @@ static const struct pmap_devmap ixp425_d
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
extern vaddr_t xscale_cache_clean_addr;
Index: src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
diff -u src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.62 src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.63
--- src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.62 Tue Jul 16 09:25:56 2019
+++ src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c Tue Jul 16 14:41:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ixm1200_machdep.c,v 1.62 2019/07/16 09:25:56 skrll Exp $ */
+/* $NetBSD: ixm1200_machdep.c,v 1.63 2019/07/16 14:41:46 skrll Exp $ */
/*
* Copyright (c) 2002, 2003
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.62 2019/07/16 09:25:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.63 2019/07/16 14:41:46 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -323,7 +323,7 @@ static const struct pmap_devmap ixm1200_
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
int loop;
Index: src/sys/arch/evbarm/iyonix/iyonix_machdep.c
diff -u src/sys/arch/evbarm/iyonix/iyonix_machdep.c:1.1 src/sys/arch/evbarm/iyonix/iyonix_machdep.c:1.2
--- src/sys/arch/evbarm/iyonix/iyonix_machdep.c:1.1 Thu Feb 14 21:47:52 2019
+++ src/sys/arch/evbarm/iyonix/iyonix_machdep.c Tue Jul 16 14:41:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: iyonix_machdep.c,v 1.1 2019/02/14 21:47:52 macallan Exp $ */
+/* $NetBSD: iyonix_machdep.c,v 1.2 2019/07/16 14:41:46 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.1 2019/02/14 21:47:52 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.2 2019/07/16 14:41:46 skrll Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -433,7 +433,7 @@ iyonix_pic_init(void)
}
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -445,7 +445,7 @@ iyonix_pic_init(void)
* Setting up page tables for the kernel
* Initialising interrupt controllers to a sane default state
*/
-u_int
+vaddr_t
initarm(void *arg)
{
struct bootconfig *passed_bootconfig = arg;
Index: src/sys/arch/evbarm/kobo/kobo_machdep.c
diff -u src/sys/arch/evbarm/kobo/kobo_machdep.c:1.6 src/sys/arch/evbarm/kobo/kobo_machdep.c:1.7
--- src/sys/arch/evbarm/kobo/kobo_machdep.c:1.6 Sat May 18 08:49:24 2019
+++ src/sys/arch/evbarm/kobo/kobo_machdep.c Tue Jul 16 14:41:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kobo_machdep.c,v 1.6 2019/05/18 08:49:24 skrll Exp $ */
+/* $NetBSD: kobo_machdep.c,v 1.7 2019/07/16 14:41:47 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2005, 2010 Genetec Corporation.
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kobo_machdep.c,v 1.6 2019/05/18 08:49:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobo_machdep.c,v 1.7 2019/07/16 14:41:47 skrll Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_arm_debug.h"
@@ -411,7 +411,7 @@ int consrate = CONSPEED;
#endif
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -422,7 +422,7 @@ int consrate = CONSPEED;
* Initialising the physical console so characters can be printed.
* Setting up page tables for the kernel
*/
-u_int
+vaddr_t
initarm(void *arg)
{
/*
Index: src/sys/arch/evbarm/lubbock/lubbock_machdep.c
diff -u src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.38 src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.39
--- src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.38 Tue Jul 16 09:25:56 2019
+++ src/sys/arch/evbarm/lubbock/lubbock_machdep.c Tue Jul 16 14:41:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lubbock_machdep.c,v 1.38 2019/07/16 09:25:56 skrll Exp $ */
+/* $NetBSD: lubbock_machdep.c,v 1.39 2019/07/16 14:41:47 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.38 2019/07/16 09:25:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.39 2019/07/16 14:41:47 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -400,7 +400,7 @@ static const struct pmap_devmap lubbock_
#undef _S
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -412,7 +412,7 @@ static const struct pmap_devmap lubbock_
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
extern vaddr_t xscale_cache_clean_addr;
Index: src/sys/arch/evbarm/marvell/marvell_machdep.c
diff -u src/sys/arch/evbarm/marvell/marvell_machdep.c:1.35 src/sys/arch/evbarm/marvell/marvell_machdep.c:1.36
--- src/sys/arch/evbarm/marvell/marvell_machdep.c:1.35 Fri Sep 21 12:04:09 2018
+++ src/sys/arch/evbarm/marvell/marvell_machdep.c Tue Jul 16 14:41:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: marvell_machdep.c,v 1.35 2018/09/21 12:04:09 skrll Exp $ */
+/* $NetBSD: marvell_machdep.c,v 1.36 2019/07/16 14:41:47 skrll Exp $ */
/*
* Copyright (c) 2007, 2008, 2010 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: marvell_machdep.c,v 1.35 2018/09/21 12:04:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: marvell_machdep.c,v 1.36 2019/07/16 14:41:47 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -274,7 +274,7 @@ static struct pmap_devmap marvell_devmap
extern uint32_t *u_boot_args[];
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -286,7 +286,7 @@ extern uint32_t *u_boot_args[];
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
int cs, cs_end, memtag = 0, iotag = 0;
Index: src/sys/arch/evbarm/mini2440/mini2440_machdep.c
diff -u src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.14 src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.15
--- src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.14 Tue Jul 16 09:25:56 2019
+++ src/sys/arch/evbarm/mini2440/mini2440_machdep.c Tue Jul 16 14:41:47 2019
@@ -131,7 +131,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mini2440_machdep.c,v 1.14 2019/07/16 09:25:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mini2440_machdep.c,v 1.15 2019/07/16 14:41:47 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -425,7 +425,7 @@ read_ttb(void)
#define ioreg_write32(a,v) (*(volatile uint32_t *)(a)=(v))
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -438,7 +438,7 @@ read_ttb(void)
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
int loop;
Index: src/sys/arch/evbarm/mmnet/mmnet_machdep.c
diff -u src/sys/arch/evbarm/mmnet/mmnet_machdep.c:1.3 src/sys/arch/evbarm/mmnet/mmnet_machdep.c:1.4
--- src/sys/arch/evbarm/mmnet/mmnet_machdep.c:1.3 Sun Jul 15 05:16:42 2018
+++ src/sys/arch/evbarm/mmnet/mmnet_machdep.c Tue Jul 16 14:41:47 2019
@@ -1,5 +1,5 @@
-/* $Id: mmnet_machdep.c,v 1.3 2018/07/15 05:16:42 maxv Exp $ */
-/* $NetBSD: mmnet_machdep.c,v 1.3 2018/07/15 05:16:42 maxv Exp $ */
+/* $Id: mmnet_machdep.c,v 1.4 2019/07/16 14:41:47 skrll Exp $ */
+/* $NetBSD: mmnet_machdep.c,v 1.4 2019/07/16 14:41:47 skrll Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -78,7 +78,7 @@
/* Adaptation for Propox MMnet by Aymeric Vincent is in the public domain */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mmnet_machdep.c,v 1.3 2018/07/15 05:16:42 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mmnet_machdep.c,v 1.4 2019/07/16 14:41:47 skrll Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -224,7 +224,7 @@ cpu_reboot(int howto, char *bootstr)
}
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -236,10 +236,10 @@ cpu_reboot(int howto, char *bootstr)
* Setting up page tables for the kernel
* Initialising interrupt controllers to a sane default state
*/
-u_int
+vaddr_t
initarm(void *arg)
{
- u_int ret;
+ vaddr_t sp;
/*
* basic AT91 initialization:
*/
@@ -260,7 +260,7 @@ initarm(void *arg)
bootconfig.dramblocks = 1;
bootconfig.dram[0].address = 0x20000000UL;
bootconfig.dram[0].pages = 0x04000000UL / PAGE_SIZE;
- ret = at91bus_setup(&bootconfig);
+ sp = at91bus_setup(&bootconfig);
if (AT91_CHIP_ID() != AT91SAM9260_CHIP_ID)
panic("%s: processor is not AT91SAM9260", __FUNCTION__);
@@ -269,7 +269,7 @@ initarm(void *arg)
evbarm_device_register = mmnet_device_register;
/* We return the new stack pointer address */
- return ret;
+ return sp;
}
Index: src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c
diff -u src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c:1.10 src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c:1.11
--- src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c:1.10 Sun Jul 15 05:16:42 2018
+++ src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c Tue Jul 16 14:41:47 2019
@@ -1,5 +1,5 @@
-/* $Id: mpcsa_machdep.c,v 1.10 2018/07/15 05:16:42 maxv Exp $ */
-/* $NetBSD: mpcsa_machdep.c,v 1.10 2018/07/15 05:16:42 maxv Exp $ */
+/* $Id: mpcsa_machdep.c,v 1.11 2019/07/16 14:41:47 skrll Exp $ */
+/* $NetBSD: mpcsa_machdep.c,v 1.11 2019/07/16 14:41:47 skrll Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpcsa_machdep.c,v 1.10 2018/07/15 05:16:42 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpcsa_machdep.c,v 1.11 2019/07/16 14:41:47 skrll Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -247,7 +247,7 @@ cpu_reboot(int howto, char *bootstr)
}
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -259,10 +259,10 @@ cpu_reboot(int howto, char *bootstr)
* Setting up page tables for the kernel
* Initialising interrupt controllers to a sane default state
*/
-u_int
+vaddr_t
initarm(void *arg)
{
- u_int ret;
+ vaddr_t sp;
/*
* basic AT91 initialization:
*/
@@ -283,7 +283,7 @@ initarm(void *arg)
bootconfig.dramblocks = 1;
bootconfig.dram[0].address = 0x20000000UL;
bootconfig.dram[0].pages = 0x04000000UL / PAGE_SIZE;
- ret = at91bus_setup(&bootconfig);
+ sp = at91bus_setup(&bootconfig);
if (AT91_CHIP_ID() != AT91RM9200_CHIP_ID)
panic("%s: processor is not AT91RM9200", __FUNCTION__);
@@ -292,7 +292,7 @@ initarm(void *arg)
evbarm_device_register = mpcsa_device_register;
/* We return the new stack pointer address */
- return ret;
+ return sp;
}
Index: src/sys/arch/evbarm/netwalker/netwalker_machdep.c
diff -u src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.24 src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.25
--- src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.24 Thu Jun 13 04:20:23 2019
+++ src/sys/arch/evbarm/netwalker/netwalker_machdep.c Tue Jul 16 14:41:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netwalker_machdep.c,v 1.24 2019/06/13 04:20:23 hkenken Exp $ */
+/* $NetBSD: netwalker_machdep.c,v 1.25 2019/07/16 14:41:47 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2005, 2010 Genetec Corporation.
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.24 2019/06/13 04:20:23 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.25 2019/07/16 14:41:47 skrll Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_arm_debug.h"
@@ -234,7 +234,7 @@ static const struct pmap_devmap netwalke
#endif
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -246,7 +246,7 @@ static const struct pmap_devmap netwalke
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
/*
Index: src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c
diff -u src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c:1.17 src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c:1.18
--- src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c:1.17 Sat Mar 16 10:45:06 2019
+++ src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c Tue Jul 16 14:41:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nitrogen6_machdep.c,v 1.17 2019/03/16 10:45:06 skrll Exp $ */
+/* $NetBSD: nitrogen6_machdep.c,v 1.18 2019/07/16 14:41:47 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nitrogen6_machdep.c,v 1.17 2019/03/16 10:45:06 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nitrogen6_machdep.c,v 1.18 2019/07/16 14:41:47 skrll Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_arm_debug.h"
@@ -261,7 +261,7 @@ nitrogen6_mpstart(void)
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -272,7 +272,7 @@ nitrogen6_mpstart(void)
* Initialising the physical console so characters can be printed.
* Setting up page tables for the kernel
*/
-u_int
+vaddr_t
initarm(void *arg)
{
psize_t memsize;
@@ -384,7 +384,7 @@ initarm(void *arg)
nbp = 1;
}
#endif
- u_int sp = initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, bp, nbp);
+ vaddr_t sp = initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, bp, nbp);
/*
* initarm_common flushes cache if required before AP start
Index: src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
diff -u src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.25 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.26
--- src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.25 Tue Jul 16 09:25:56 2019
+++ src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c Tue Jul 16 14:41:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: npwr_fc_machdep.c,v 1.25 2019/07/16 09:25:56 skrll Exp $ */
+/* $NetBSD: npwr_fc_machdep.c,v 1.26 2019/07/16 14:41:48 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.25 2019/07/16 09:25:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.26 2019/07/16 14:41:48 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -334,7 +334,7 @@ static const struct pmap_devmap iq80321_
};
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -346,7 +346,7 @@ static const struct pmap_devmap iq80321_
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
extern vaddr_t xscale_cache_clean_addr;
Index: src/sys/arch/evbarm/nslu2/nslu2_machdep.c
diff -u src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.31 src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.32
--- src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.31 Tue Jul 16 09:25:57 2019
+++ src/sys/arch/evbarm/nslu2/nslu2_machdep.c Tue Jul 16 14:41:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nslu2_machdep.c,v 1.31 2019/07/16 09:25:57 skrll Exp $ */
+/* $NetBSD: nslu2_machdep.c,v 1.32 2019/07/16 14:41:48 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.31 2019/07/16 09:25:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.32 2019/07/16 14:41:48 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -413,7 +413,7 @@ static const struct pmap_devmap nslu2_de
};
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -425,7 +425,7 @@ static const struct pmap_devmap nslu2_de
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
extern vaddr_t xscale_cache_clean_addr;
Index: src/sys/arch/evbarm/osk5912/osk5912_machdep.c
diff -u src/sys/arch/evbarm/osk5912/osk5912_machdep.c:1.21 src/sys/arch/evbarm/osk5912/osk5912_machdep.c:1.22
--- src/sys/arch/evbarm/osk5912/osk5912_machdep.c:1.21 Tue Jul 16 09:25:57 2019
+++ src/sys/arch/evbarm/osk5912/osk5912_machdep.c Tue Jul 16 14:41:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: osk5912_machdep.c,v 1.21 2019/07/16 09:25:57 skrll Exp $ */
+/* $NetBSD: osk5912_machdep.c,v 1.22 2019/07/16 14:41:48 skrll Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -99,7 +99,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osk5912_machdep.c,v 1.21 2019/07/16 09:25:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osk5912_machdep.c,v 1.22 2019/07/16 14:41:48 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -313,7 +313,7 @@ static const struct pmap_devmap devmap[]
#undef _S
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -325,7 +325,7 @@ static const struct pmap_devmap devmap[]
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
/*
Index: src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.40 src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.41
--- src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.40 Tue Jul 16 09:25:57 2019
+++ src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c Tue Jul 16 14:41:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2410_machdep.c,v 1.40 2019/07/16 09:25:57 skrll Exp $ */
+/* $NetBSD: smdk2410_machdep.c,v 1.41 2019/07/16 14:41:48 skrll Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.40 2019/07/16 09:25:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.41 2019/07/16 14:41:48 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -397,7 +397,7 @@ read_ttb(void)
#define ioreg_write32(a,v) (*(volatile uint32_t *)(a)=(v))
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -410,7 +410,7 @@ read_ttb(void)
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
int loop;
Index: src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.46 src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.47
--- src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.46 Tue Jul 16 09:25:57 2019
+++ src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c Tue Jul 16 14:41:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2800_machdep.c,v 1.46 2019/07/16 09:25:57 skrll Exp $ */
+/* $NetBSD: smdk2800_machdep.c,v 1.47 2019/07/16 14:41:48 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Fujitsu Component Limited
@@ -106,7 +106,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.46 2019/07/16 09:25:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.47 2019/07/16 14:41:48 skrll Exp $");
#include "opt_ddb.h"
#include "opt_console.h"
@@ -330,7 +330,7 @@ static const struct pmap_devmap smdk2800
#define ioreg32(pa) (*(volatile uint32_t *)ioreg_vaddr(pa))
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -343,7 +343,7 @@ static const struct pmap_devmap smdk2800
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
int loop;
Index: src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
diff -u src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.24 src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.25
--- src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.24 Tue Jul 16 09:25:57 2019
+++ src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c Tue Jul 16 14:41:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sdp24xx_machdep.c,v 1.24 2019/07/16 09:25:57 skrll Exp $ */
+/* $NetBSD: sdp24xx_machdep.c,v 1.25 2019/07/16 14:41:48 skrll Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.24 2019/07/16 09:25:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.25 2019/07/16 14:41:48 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -395,7 +395,7 @@ sdp_putchar(char c)
}
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -407,7 +407,7 @@ sdp_putchar(char c)
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
#if 1
Index: src/sys/arch/evbarm/tsarm/tsarm_machdep.c
diff -u src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.28 src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.29
--- src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.28 Tue Jul 16 09:25:57 2019
+++ src/sys/arch/evbarm/tsarm/tsarm_machdep.c Tue Jul 16 14:41:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tsarm_machdep.c,v 1.28 2019/07/16 09:25:57 skrll Exp $ */
+/* $NetBSD: tsarm_machdep.c,v 1.29 2019/07/16 14:41:48 skrll Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.28 2019/07/16 09:25:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.29 2019/07/16 14:41:48 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -358,7 +358,7 @@ static const struct pmap_devmap tsarm_de
};
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -370,7 +370,7 @@ static const struct pmap_devmap tsarm_de
* Setting up page tables for the kernel
* Initialising interrupt controllers to a sane default state
*/
-u_int
+vaddr_t
initarm(void *arg)
{
#ifdef FIXME
Index: src/sys/arch/evbarm/viper/viper_machdep.c
diff -u src/sys/arch/evbarm/viper/viper_machdep.c:1.29 src/sys/arch/evbarm/viper/viper_machdep.c:1.30
--- src/sys/arch/evbarm/viper/viper_machdep.c:1.29 Tue Jul 16 09:25:57 2019
+++ src/sys/arch/evbarm/viper/viper_machdep.c Tue Jul 16 14:41:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: viper_machdep.c,v 1.29 2019/07/16 09:25:57 skrll Exp $ */
+/* $NetBSD: viper_machdep.c,v 1.30 2019/07/16 14:41:48 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.29 2019/07/16 09:25:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.30 2019/07/16 14:41:48 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -371,7 +371,7 @@ static const struct pmap_devmap viper_de
#endif
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -383,7 +383,7 @@ static const struct pmap_devmap viper_de
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
extern vaddr_t xscale_cache_clean_addr;
Index: src/sys/arch/evbarm/zynq/zynq_machdep.c
diff -u src/sys/arch/evbarm/zynq/zynq_machdep.c:1.10 src/sys/arch/evbarm/zynq/zynq_machdep.c:1.11
--- src/sys/arch/evbarm/zynq/zynq_machdep.c:1.10 Sat Mar 16 10:45:06 2019
+++ src/sys/arch/evbarm/zynq/zynq_machdep.c Tue Jul 16 14:41:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: zynq_machdep.c,v 1.10 2019/03/16 10:45:06 skrll Exp $ */
+/* $NetBSD: zynq_machdep.c,v 1.11 2019/07/16 14:41:48 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zynq_machdep.c,v 1.10 2019/03/16 10:45:06 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zynq_machdep.c,v 1.11 2019/07/16 14:41:48 skrll Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_arm_debug.h"
@@ -250,7 +250,7 @@ zynq_mpstart(void)
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -261,7 +261,7 @@ zynq_mpstart(void)
* Initialising the physical console so characters can be printed.
* Setting up page tables for the kernel
*/
-u_int
+vaddr_t
initarm(void *arg)
{
/*
@@ -338,7 +338,7 @@ initarm(void *arg)
/* we've a specific device_register routine */
evbarm_device_register = zynq7000_device_register;
- u_int sp = initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, NULL, 0);
+ vaddr_t sp = initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, NULL, 0);
/*
* initarm_common flushes cache if required before AP start
Index: src/sys/arch/hpcarm/hpcarm/hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.105 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.106
--- src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.105 Fri Mar 16 12:10:16 2018
+++ src/sys/arch/hpcarm/hpcarm/hpc_machdep.c Tue Jul 16 14:41:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hpc_machdep.c,v 1.105 2018/03/16 12:10:16 ryo Exp $ */
+/* $NetBSD: hpc_machdep.c,v 1.106 2019/07/16 14:41:49 skrll Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.105 2018/03/16 12:10:16 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.106 2019/07/16 14:41:49 skrll Exp $");
#include "opt_cputypes.h"
#include "opt_kloader.h"
@@ -103,12 +103,12 @@ void *__sleep_ctx;
void (*__cpu_reset)(void) __dead = cpu_reset;
-u_int initarm(int, char **, struct bootinfo *);
+vaddr_t initarm(int, char **, struct bootinfo *);
#if defined(CPU_SA1100) || defined(CPU_SA1110)
-u_int init_sa11x0(int, char **, struct bootinfo *);
+vaddr_t init_sa11x0(int, char **, struct bootinfo *);
#endif
#if defined(CPU_XSCALE_PXA250) || defined(CPU_XSCALE_PXA270)
-u_int init_pxa2x0(int, char **, struct bootinfo *);
+vaddr_t init_pxa2x0(int, char **, struct bootinfo *);
#endif
#ifdef BOOT_DUMP
@@ -220,7 +220,7 @@ machine_standby(void)
* This includes:
* Taking a copy of the boot configuration structure.
*/
-u_int
+vaddr_t
initarm(int argc, char **argv, struct bootinfo *bi)
{
Index: src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.26 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.27
--- src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.26 Tue Jul 16 09:25:57 2019
+++ src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c Tue Jul 16 14:41:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_hpc_machdep.c,v 1.26 2019/07/16 09:25:57 skrll Exp $ */
+/* $NetBSD: pxa2x0_hpc_machdep.c,v 1.27 2019/07/16 14:41:49 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.26 2019/07/16 09:25:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.27 2019/07/16 14:41:49 skrll Exp $");
#include "opt_ddb.h"
#include "opt_dram_pages.h"
@@ -135,7 +135,7 @@ void prefetch_abort_handler(trapframe_t
void undefinedinstruction_bounce(trapframe_t *);
u_int cpu_get_control(void);
-u_int init_pxa2x0(int, char **, struct bootinfo *);
+vaddr_t init_pxa2x0(int, char **, struct bootinfo *);
/* Machine dependent initialize function */
extern void pxa2x0_machdep_init(void);
@@ -238,7 +238,7 @@ read_ttb(void)
* Initializing the physical console so characters can be printed.
* Setting up page tables for the kernel.
*/
-u_int
+vaddr_t
init_pxa2x0(int argc, char **argv, struct bootinfo *bi)
{
#ifdef DIAGNOSTIC
Index: src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.14 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.15
--- src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.14 Tue Jul 16 09:25:57 2019
+++ src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c Tue Jul 16 14:41:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sa11x0_hpc_machdep.c,v 1.14 2019/07/16 09:25:57 skrll Exp $ */
+/* $NetBSD: sa11x0_hpc_machdep.c,v 1.15 2019/07/16 14:41:49 skrll Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.14 2019/07/16 09:25:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.15 2019/07/16 14:41:49 skrll Exp $");
#include "opt_ddb.h"
#include "opt_dram_pages.h"
@@ -135,7 +135,7 @@ void prefetch_abort_handler(trapframe_t
void undefinedinstruction_bounce(trapframe_t *);
u_int cpu_get_control(void);
-u_int init_sa11x0(int, char **, struct bootinfo *);
+vaddr_t init_sa11x0(int, char **, struct bootinfo *);
#ifdef BOOT_DUMP
void dumppages(char *, int);
@@ -175,7 +175,7 @@ static const struct pmap_devmap sa11x0_d
* Initializing the physical console so characters can be printed.
* Setting up page tables for the kernel.
*/
-u_int
+vaddr_t
init_sa11x0(int argc, char **argv, struct bootinfo *bi)
{
u_int kerneldatasize, symbolsize;
Index: src/sys/arch/iyonix/iyonix/iyonix_machdep.c
diff -u src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.27 src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.28
--- src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.27 Tue Jul 16 09:25:57 2019
+++ src/sys/arch/iyonix/iyonix/iyonix_machdep.c Tue Jul 16 14:41:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: iyonix_machdep.c,v 1.27 2019/07/16 09:25:57 skrll Exp $ */
+/* $NetBSD: iyonix_machdep.c,v 1.28 2019/07/16 14:41:49 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.27 2019/07/16 09:25:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.28 2019/07/16 14:41:49 skrll Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -417,7 +417,7 @@ iyonix_pic_init(void)
}
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -429,7 +429,7 @@ iyonix_pic_init(void)
* Setting up page tables for the kernel
* Initialising interrupt controllers to a sane default state
*/
-u_int
+vaddr_t
initarm(void *arg)
{
struct bootconfig *passed_bootconfig = arg;
Index: src/sys/arch/netwinder/netwinder/netwinder_machdep.c
diff -u src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.87 src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.88
--- src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.87 Tue Jul 16 09:25:57 2019
+++ src/sys/arch/netwinder/netwinder/netwinder_machdep.c Tue Jul 16 14:41:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netwinder_machdep.c,v 1.87 2019/07/16 09:25:57 skrll Exp $ */
+/* $NetBSD: netwinder_machdep.c,v 1.88 2019/07/16 14:41:49 skrll Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.87 2019/07/16 09:25:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.88 2019/07/16 14:41:49 skrll Exp $");
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -368,7 +368,7 @@ struct l1_sec_map {
};
/*
- * u_int initarm(...);
+ * vaddr_t initarm(...);
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -381,7 +381,7 @@ struct l1_sec_map {
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
int loop;
Index: src/sys/arch/shark/shark/shark_machdep.c
diff -u src/sys/arch/shark/shark/shark_machdep.c:1.45 src/sys/arch/shark/shark/shark_machdep.c:1.46
--- src/sys/arch/shark/shark/shark_machdep.c:1.45 Tue Jul 16 09:25:58 2019
+++ src/sys/arch/shark/shark/shark_machdep.c Tue Jul 16 14:41:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: shark_machdep.c,v 1.45 2019/07/16 09:25:58 skrll Exp $ */
+/* $NetBSD: shark_machdep.c,v 1.46 2019/07/16 14:41:49 skrll Exp $ */
/*
* Copyright 1997
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: shark_machdep.c,v 1.45 2019/07/16 09:25:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shark_machdep.c,v 1.46 2019/07/16 14:41:49 skrll Exp $");
#include "opt_ddb.h"
#include "opt_modular.h"
@@ -182,7 +182,7 @@ cpu_reboot(int howto, char *bootstr)
}
/*
- * u_int initarm(void *handle)
+ * vaddr_t initarm(void *handle)
*
* Initial entry point on startup for a GENERIC OFW
* system. Called with MMU on, running in the OFW
@@ -201,7 +201,7 @@ cpu_reboot(int howto, char *bootstr)
struct fiqhandler shark_fiqhandler;
struct fiqregs shark_fiqregs;
-u_int
+vaddr_t
initarm(void *arg)
{
ofw_handle_t ofw_handle = arg;
Index: src/sys/arch/zaurus/zaurus/machdep.c
diff -u src/sys/arch/zaurus/zaurus/machdep.c:1.41 src/sys/arch/zaurus/zaurus/machdep.c:1.42
--- src/sys/arch/zaurus/zaurus/machdep.c:1.41 Tue Jul 16 09:25:58 2019
+++ src/sys/arch/zaurus/zaurus/machdep.c Tue Jul 16 14:41:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.41 2019/07/16 09:25:58 skrll Exp $ */
+/* $NetBSD: machdep.c,v 1.42 2019/07/16 14:41:49 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.41 2019/07/16 09:25:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.42 2019/07/16 14:41:49 skrll Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -620,7 +620,7 @@ hw_isc1000(void)
}
/*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
*
* Initial entry point on startup. This gets called before main() is
* entered.
@@ -632,7 +632,7 @@ hw_isc1000(void)
* Setting up page tables for the kernel
* Relocating the kernel to the bottom of physical memory
*/
-u_int
+vaddr_t
initarm(void *arg)
{
#ifdef DIAGNOSTIC
