Module Name: src
Committed By: skrll
Date: Sat Apr 18 10:55:47 UTC 2020
Modified Files:
src/sys/arch/acorn32/acorn32: rpc_machdep.c
src/sys/arch/acorn32/conf: EB7500ATX
src/sys/arch/acorn32/eb7500atx: eb7500atx_machdep.c
src/sys/arch/arm/at91: at91bus.c
src/sys/arch/cats/conf: GENERIC
src/sys/arch/evbarm/adi_brh: brh_machdep.c
src/sys/arch/evbarm/armadillo: armadillo9_machdep.c
src/sys/arch/evbarm/conf: GENERIC64 IYONIX MARVELL_NAS
src/sys/arch/evbarm/g42xxeb: g42xxeb_machdep.c
src/sys/arch/evbarm/hdl_g: hdlg_machdep.c
src/sys/arch/evbarm/imx31: imx31lk_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/lubbock: lubbock_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/npwr_fc: npwr_fc_machdep.c
src/sys/arch/evbarm/nslu2: nslu2_machdep.c
src/sys/arch/evbarm/smdk2xx0: smdk2410_machdep.c smdk2800_machdep.c
src/sys/arch/evbarm/tsarm: tsarm_machdep.c
src/sys/arch/evbarm/viper: viper_machdep.c
src/sys/arch/hpcarm/hpcarm: pxa2x0_hpc_machdep.c sa11x0_hpc_machdep.c
src/sys/arch/iyonix/conf: GENERIC
src/sys/arch/iyonix/iyonix: iyonix_machdep.c
src/sys/arch/netwinder/conf: GENERIC
src/sys/arch/netwinder/netwinder: netwinder_machdep.c
src/sys/arch/zaurus/zaurus: machdep.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/acorn32/acorn32/rpc_machdep.c
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/acorn32/conf/EB7500ATX
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/at91/at91bus.c
cvs rdiff -u -r1.178 -r1.179 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/evbarm/adi_brh/brh_machdep.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
cvs rdiff -u -r1.152 -r1.153 src/sys/arch/evbarm/conf/GENERIC64
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/IYONIX
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbarm/conf/MARVELL_NAS
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/imx31/imx31lk_machdep.c
cvs rdiff -u -r1.77 -r1.78 \
src/sys/arch/evbarm/integrator/integrator_machdep.c
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/evbarm/iq80310/iq80310_machdep.c
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/evbarm/iq80321/iq80321_machdep.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/iyonix/iyonix_machdep.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/lubbock/lubbock_machdep.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/mini2440/mini2440_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/mmnet/mmnet_machdep.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/nslu2/nslu2_machdep.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/tsarm/tsarm_machdep.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/viper/viper_machdep.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/iyonix/conf/GENERIC
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/iyonix/iyonix/iyonix_machdep.c
cvs rdiff -u -r1.137 -r1.138 src/sys/arch/netwinder/conf/GENERIC
cvs rdiff -u -r1.88 -r1.89 \
src/sys/arch/netwinder/netwinder/netwinder_machdep.c
cvs rdiff -u -r1.45 -r1.46 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.96 src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.97
--- src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.96 Fri Oct 4 12:08:33 2019
+++ src/sys/arch/acorn32/acorn32/rpc_machdep.c Sat Apr 18 10:55:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc_machdep.c,v 1.96 2019/10/04 12:08:33 christos Exp $ */
+/* $NetBSD: rpc_machdep.c,v 1.97 2020/04/18 10:55: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.96 2019/10/04 12:08:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.97 2020/04/18 10:55:43 skrll Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -151,7 +151,7 @@ extern int pmap_debug_level;
#define KERNEL_PT_KERNEL 2 /* Page table for mapping kernel 0-4MB*/
#define KERNEL_PT_KERNEL_4MB 3 /* Page table for mapping kernel 4-8MB*/
#define KERNEL_PT_VMDATA 4 /* Page tables for mapping kernel VM */
-#define KERNEL_PT_VMDATA_NUM 4 /* start with 16MB of KVM */
+#define KERNEL_PT_VMDATA_NUM 4 /* start with 16MB of KVM */
#define NUM_KERNEL_PTS (KERNEL_PT_VMDATA + KERNEL_PT_VMDATA_NUM)
pv_addr_t kernel_pt_table[NUM_KERNEL_PTS];
@@ -336,7 +336,7 @@ cpu_reboot(int howto, char *bootstr)
/*
* Mapping table for core kernel memory. This memory is mapped at init
* time with section mappings.
- *
+ *
* XXX One big assumption in the current architecture seems that the kernel is
* XXX supposed to be mapped into bootconfig.dram[0].
*/
@@ -431,9 +431,9 @@ initarm(void *cookie)
videomemory.vidm_vbase = bootconfig.display_start;
videomemory.vidm_pbase = bootconfig.display_phys;
videomemory.vidm_size = bootconfig.display_size;
- if (bootconfig.vram[0].pages)
+ if (bootconfig.vram[0].pages)
videomemory.vidm_type = VIDEOMEM_TYPE_VRAM;
- else
+ else
videomemory.vidm_type = VIDEOMEM_TYPE_DRAM;
vidc_base = (int *) VIDC_HW_BASE;
iomd_base = IOMD_HW_BASE;
@@ -475,7 +475,7 @@ initarm(void *cookie)
* The initarm() has the responsibility for creating the kernel
* page tables.
* It must also set up various memory pointers that are used
- * by pmap etc.
+ * by pmap etc.
*/
#ifdef FORCE_VERBOSE_INIT_ARM
@@ -489,7 +489,7 @@ initarm(void *cookie)
#define VERBOSE_INIT_ARM
#endif
/* START OF REAL NEW STUFF */
-
+
/* Check to make sure the page size is correct */
if (PAGE_SIZE != bootconfig.pagesize)
panic2(("Page size is %d bytes instead of %d !! (huh?)\n",
@@ -500,7 +500,7 @@ initarm(void *cookie)
/*
* Now set up the page tables for the kernel ... this part is copied
- * in a (modified?) way from the EBSA machine port....
+ * in a (modified?) way from the EBSA machine port....
*/
#ifdef VERBOSE_INIT_ARM
@@ -511,7 +511,7 @@ initarm(void *cookie)
* memory
*/
physical_start = 0xffffffff;
- physical_end = 0;
+ physical_end = 0;
kinetic_physical_start = 0xffffffff;
#ifdef VERBOSE_INIT_ARM
printf("memory blocks:\n");
@@ -567,7 +567,7 @@ initarm(void *cookie)
physical_freestart = kernel_start;
free_pages = bootconfig.drampages;
physical_freeend = physical_end;
-
+
/*
* AHUM !! set this variable ... it was set up in the old 1st
* stage bootloader
@@ -578,7 +578,7 @@ initarm(void *cookie)
physical_freestart +=
bootconfig.kernsize + bootconfig.scratchsize;
free_pages -= (bootconfig.kernsize + bootconfig.scratchsize) / PAGE_SIZE;
-
+
/* Define a macro to simplify memory allocation */
#define valloc_pages(var, np) \
alloc_pages((var).pv_pa, (np)); \
@@ -627,13 +627,13 @@ initarm(void *cookie)
#ifdef VERBOSE_INIT_ARM
printf("Setting up stacks :\n");
printf("IRQ stack: p0x%08lx v0x%08lx\n",
- irqstack.pv_pa, irqstack.pv_va);
+ irqstack.pv_pa, irqstack.pv_va);
printf("ABT stack: p0x%08lx v0x%08lx\n",
- abtstack.pv_pa, abtstack.pv_va);
+ abtstack.pv_pa, abtstack.pv_va);
printf("UND stack: p0x%08lx v0x%08lx\n",
- undstack.pv_pa, undstack.pv_va);
+ undstack.pv_pa, undstack.pv_va);
printf("SVC stack: p0x%08lx v0x%08lx\n",
- kernelstack.pv_pa, kernelstack.pv_va);
+ kernelstack.pv_pa, kernelstack.pv_va);
printf("\n");
#endif
@@ -818,7 +818,7 @@ initarm(void *cookie)
*/
uvm_lwp_setuarea(&lwp0, kernelstack.pv_va);
- /*
+ /*
* if there is support for a serial console ...we should now
* reattach it
*/
@@ -901,7 +901,7 @@ initarm(void *cookie)
* We now have the kernel in physical memory from the bottom upwards.
* Kernel page tables are physically above this.
* The kernel is mapped to 0xf0000000
- * The kernel data PTs will handle the mapping of
+ * The kernel data PTs will handle the mapping of
* 0xf1000000-0xf5ffffff (80 Mb)
* 2Meg of VRAM is mapped to 0xf7000000
* The page tables are mapped to 0xefc00000
@@ -1014,7 +1014,7 @@ initarm(void *cookie)
#ifdef CPU_SA110
if (cputype == CPU_ID_SA110)
- rpc_sa110_cc_setup();
+ rpc_sa110_cc_setup();
#endif /* CPU_SA110 */
#if NKSYMS || defined(DDB) || defined(MODULAR)
Index: src/sys/arch/acorn32/conf/EB7500ATX
diff -u src/sys/arch/acorn32/conf/EB7500ATX:1.69 src/sys/arch/acorn32/conf/EB7500ATX:1.70
--- src/sys/arch/acorn32/conf/EB7500ATX:1.69 Sun Jan 19 01:25:03 2020
+++ src/sys/arch/acorn32/conf/EB7500ATX Sat Apr 18 10:55:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: EB7500ATX,v 1.69 2020/01/19 01:25:03 thorpej Exp $
+# $NetBSD: EB7500ATX,v 1.70 2020/04/18 10:55:43 skrll Exp $
#
# EB7500ATX --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "EB7500ATX-$Revision: 1.69 $"
+#ident "EB7500ATX-$Revision: 1.70 $"
# estimated number of users
maxusers 32
@@ -222,7 +222,7 @@ atapibus* at atapi?
cs* at rsbus?
# Builtin DS1687 clock
-# Not functioning (yet)
+# Not functioning (yet)
#ds1687rtc* at rsbus?
pseudo-device loop # network loopback
Index: src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
diff -u src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.32 src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.33
--- src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.32 Sun Mar 29 10:25:28 2020
+++ src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c Sat Apr 18 10:55:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: eb7500atx_machdep.c,v 1.32 2020/03/29 10:25:28 skrll Exp $ */
+/* $NetBSD: eb7500atx_machdep.c,v 1.33 2020/04/18 10:55: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.32 2020/03/29 10:25:28 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.33 2020/04/18 10:55:43 skrll Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -156,7 +156,7 @@ extern int pmap_debug_level;
#define KERNEL_PT_SYS 1 /* Page table for mapping proc0 zero page */
#define KERNEL_PT_KERNEL 2 /* Page table for mapping kernel */
#define KERNEL_PT_VMDATA 3 /* Page tables for mapping kernel VM */
-#define KERNEL_PT_VMDATA_NUM 4 /* start with 16MB of KVM */
+#define KERNEL_PT_VMDATA_NUM 4 /* start with 16MB of KVM */
#define NUM_KERNEL_PTS (KERNEL_PT_VMDATA + KERNEL_PT_VMDATA_NUM)
pv_addr_t kernel_pt_table[NUM_KERNEL_PTS];
@@ -313,7 +313,7 @@ cpu_reboot(int howto, char *bootstr)
/*
* Mapping table for core kernel memory. This memory is mapped at init
* time with section mappings.
- *
+ *
* XXX One big assumption in the current architecture seems that the kernel is
* XXX supposed to be mapped into bootconfig.dram[0].
*/
@@ -396,9 +396,9 @@ initarm(void *cookie)
videomemory.vidm_vbase = bootconfig.display_start;
videomemory.vidm_pbase = bootconfig.display_phys;
videomemory.vidm_size = bootconfig.display_size;
- if (bootconfig.vram[0].pages)
+ if (bootconfig.vram[0].pages)
videomemory.vidm_type = VIDEOMEM_TYPE_VRAM;
- else
+ else
videomemory.vidm_type = VIDEOMEM_TYPE_DRAM;
vidc_base = (int *) VIDC_HW_BASE;
iomd_base = IOMD_HW_BASE;
@@ -438,7 +438,7 @@ initarm(void *cookie)
* The initarm() has the responsibility for creating the kernel
* page tables.
* It must also set up various memory pointers that are used
- * by pmap etc.
+ * by pmap etc.
*/
/* START OF REAL NEW STUFF */
@@ -454,7 +454,7 @@ initarm(void *cookie)
/*
* Now set up the page tables for the kernel ... this part is copied
- * in a (modified?) way from the EBSA machine port....
+ * in a (modified?) way from the EBSA machine port....
*/
#ifdef VERBOSE_INIT_ARM
@@ -465,7 +465,7 @@ initarm(void *cookie)
* memory
*/
physical_start = 0xffffffff;
- physical_end = 0;
+ physical_end = 0;
for (loop = 0, physmem = 0; loop < bootconfig.dramblocks; ++loop) {
if (bootconfig.dram[loop].address < physical_start)
physical_start = bootconfig.dram[loop].address;
@@ -484,7 +484,7 @@ initarm(void *cookie)
if (physical_start != bootconfig.dram[0].address) {
int oldblocks = 0;
- /*
+ /*
* must be a kinetic, as it's the only thing to shuffle memory
* around
*/
@@ -502,13 +502,13 @@ initarm(void *cookie)
}
}
physical_start = bootconfig.dram[0].address;
- bootconfig.dramblocks -= oldblocks;
+ bootconfig.dramblocks -= oldblocks;
}
-
+
physical_freestart = physical_start;
free_pages = bootconfig.drampages;
physical_freeend = physical_end;
-
+
/*
* AHUM !! set this variable ... it was set up in the old 1st
@@ -521,7 +521,7 @@ initarm(void *cookie)
physical_freestart +=
bootconfig.kernsize + bootconfig.MDFsize + bootconfig.scratchsize;
free_pages -= (physical_freestart - physical_start) / PAGE_SIZE;
-
+
/* Define a macro to simplify memory allocation */
#define valloc_pages(var, np) \
alloc_pages((var).pv_pa, (np)); \
@@ -571,13 +571,13 @@ initarm(void *cookie)
#ifdef VERBOSE_INIT_ARM
printf("Setting up stacks :\n");
printf("IRQ stack: p0x%08lx v0x%08lx\n",
- irqstack.pv_pa, irqstack.pv_va);
+ irqstack.pv_pa, irqstack.pv_va);
printf("ABT stack: p0x%08lx v0x%08lx\n",
- abtstack.pv_pa, abtstack.pv_va);
+ abtstack.pv_pa, abtstack.pv_va);
printf("UND stack: p0x%08lx v0x%08lx\n",
- undstack.pv_pa, undstack.pv_va);
+ undstack.pv_pa, undstack.pv_va);
printf("SVC stack: p0x%08lx v0x%08lx\n",
- kernelstack.pv_pa, kernelstack.pv_va);
+ kernelstack.pv_pa, kernelstack.pv_va);
printf("\n");
#endif
@@ -762,7 +762,7 @@ initarm(void *cookie)
*/
uvm_lwp_setuarea(&lwp0, kernelstack.pv_va);
- /*
+ /*
* if there is support for a serial console ...we should now
* reattach it
*/
@@ -839,7 +839,7 @@ initarm(void *cookie)
* We now have the kernel in physical memory from the bottom upwards.
* Kernel page tables are physically above this.
* The kernel is mapped to 0xf0000000
- * The kernel data PTs will handle the mapping of
+ * The kernel data PTs will handle the mapping of
* 0xf1000000-0xf5ffffff (80 Mb)
* 2Meg of VRAM is mapped to 0xf7000000
* The page tables are mapped to 0xefc00000
Index: src/sys/arch/arm/at91/at91bus.c
diff -u src/sys/arch/arm/at91/at91bus.c:1.25 src/sys/arch/arm/at91/at91bus.c:1.26
--- src/sys/arch/arm/at91/at91bus.c:1.25 Tue Jul 16 14:41:43 2019
+++ src/sys/arch/arm/at91/at91bus.c Sat Apr 18 10:55:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: at91bus.c,v 1.25 2019/07/16 14:41:43 skrll Exp $ */
+/* $NetBSD: at91bus.c,v 1.26 2020/04/18 10:55:43 skrll Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.25 2019/07/16 14:41:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.26 2020/04/18 10:55:43 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -115,7 +115,7 @@ extern int pmap_debug_level;
#define KERNEL_PT_KERNEL 1 /* L2 table for mapping kernel */
#define KERNEL_PT_KERNEL_NUM 4
- /* L2 tables for mapping kernel VM */
+ /* L2 tables for mapping kernel VM */
#define KERNEL_PT_VMDATA (KERNEL_PT_KERNEL + KERNEL_PT_KERNEL_NUM)
#define KERNEL_PT_VMDATA_NUM 4 /* start with 16MB of KVM */
@@ -319,20 +319,20 @@ at91bus_setup(BootConfig *mem)
#ifdef VERBOSE_INIT_ARM
printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa,
- irqstack.pv_va);
+ irqstack.pv_va);
printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa,
- abtstack.pv_va);
+ abtstack.pv_va);
printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa,
- undstack.pv_va);
+ undstack.pv_va);
printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa,
- kernelstack.pv_va);
+ kernelstack.pv_va);
#endif
alloc_pages(msgbufphys, round_page(MSGBUFSIZE) / PAGE_SIZE);
/*
* Ok we have allocated physical pages for the primary kernel
- * page tables. Save physical_freeend for when we give whats left
+ * page tables. Save physical_freeend for when we give whats left
* of memory below 2Mbyte to UVM.
*/
@@ -616,11 +616,11 @@ at91bus_attach(device_t parent, device_t
AT91_PLLBCLK / 1000000U, (AT91_PLLBCLK / 1000U) % 1000U);
/*
- * Attach devices
+ * Attach devices
*/
at91_search_peripherals(self, at91bus_found);
-
+
struct at91bus_attach_args sa;
memset(&sa, 0, sizeof(sa));
sa.sa_iot = sc->sc_iot;
Index: src/sys/arch/cats/conf/GENERIC
diff -u src/sys/arch/cats/conf/GENERIC:1.178 src/sys/arch/cats/conf/GENERIC:1.179
--- src/sys/arch/cats/conf/GENERIC:1.178 Wed Jan 29 18:39:01 2020
+++ src/sys/arch/cats/conf/GENERIC Sat Apr 18 10:55:43 2020
@@ -1,7 +1,7 @@
-# $NetBSD: GENERIC,v 1.178 2020/01/29 18:39:01 maya Exp $
+# $NetBSD: GENERIC,v 1.179 2020/04/18 10:55:43 skrll Exp $
#
# GENERIC machine description file
-#
+#
# This machine description file is used to generate the default NetBSD
# kernel. The generic kernel does not include all options, subsystems
# and device drivers, but should be useful for most applications.
Index: src/sys/arch/evbarm/adi_brh/brh_machdep.c
diff -u src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.48 src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.49
--- src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.48 Tue Jul 16 14:41:44 2019
+++ src/sys/arch/evbarm/adi_brh/brh_machdep.c Sat Apr 18 10:55:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: brh_machdep.c,v 1.48 2019/07/16 14:41:44 skrll Exp $ */
+/* $NetBSD: brh_machdep.c,v 1.49 2020/04/18 10:55:43 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.48 2019/07/16 14:41:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.49 2020/04/18 10:55:43 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -160,7 +160,7 @@ extern int pmap_debug_level;
#define KERNEL_PT_KERNEL 1 /* L2 table for mapping kernel */
#define KERNEL_PT_KERNEL_NUM 2
- /* L2 tables for mapping kernel VM */
+ /* L2 tables for mapping kernel VM */
#define KERNEL_PT_VMDATA (KERNEL_PT_KERNEL + KERNEL_PT_KERNEL_NUM)
#define KERNEL_PT_VMDATA_NUM 4 /* start with 16MB of KVM */
#define NUM_KERNEL_PTS (KERNEL_PT_VMDATA + KERNEL_PT_VMDATA_NUM)
@@ -241,7 +241,7 @@ cpu_reboot(int howto, char *bootstr)
/* Do a dump if requested. */
if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
dumpsys();
-
+
/* Run any shutdown hooks */
doshutdownhooks();
@@ -520,13 +520,13 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa,
- irqstack.pv_va);
+ irqstack.pv_va);
printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa,
- abtstack.pv_va);
+ abtstack.pv_va);
printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa,
- undstack.pv_va);
+ undstack.pv_va);
printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa,
- kernelstack.pv_va);
+ kernelstack.pv_va);
#endif
/*
@@ -578,7 +578,7 @@ initarm(void *arg)
textsize = (textsize + PGOFSET) & ~PGOFSET;
totalsize = (totalsize + PGOFSET) & ~PGOFSET;
-
+
logical = 0x00200000; /* offset of kernel in RAM */
logical += pmap_map_chunk(l1pagetable, KERNEL_BASE + logical,
Index: src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
diff -u src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.34 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.35
--- src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.34 Tue Jul 16 14:41:44 2019
+++ src/sys/arch/evbarm/armadillo/armadillo9_machdep.c Sat Apr 18 10:55:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: armadillo9_machdep.c,v 1.34 2019/07/16 14:41:44 skrll Exp $ */
+/* $NetBSD: armadillo9_machdep.c,v 1.35 2020/04/18 10:55: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.34 2019/07/16 14:41:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.35 2020/04/18 10:55:44 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -218,7 +218,7 @@ paddr_t msgbufphys;
static struct arm32_dma_range armadillo9_dma_ranges[4];
#if NISA > 0
-extern void isa_armadillo9_init(u_int, u_int);
+extern void isa_armadillo9_init(u_int, u_int);
#endif
#ifdef PMAP_DEBUG
@@ -229,7 +229,7 @@ extern int pmap_debug_level;
#define KERNEL_PT_KERNEL 1 /* L2 table for mapping kernel */
#define KERNEL_PT_KERNEL_NUM 4
- /* L2 tables for mapping kernel VM */
+ /* L2 tables for mapping kernel VM */
#define KERNEL_PT_VMDATA (KERNEL_PT_KERNEL + KERNEL_PT_KERNEL_NUM)
#define KERNEL_PT_VMDATA_NUM 4 /* start with 16MB of KVM */
@@ -351,7 +351,7 @@ cpu_reboot(int howto, char *bootstr)
/* Do a dump if requested. */
if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
dumpsys();
-
+
/* Run any shutdown hooks */
doshutdownhooks();
@@ -476,7 +476,7 @@ initarm(void *arg)
consinit();
/* identify model */
- devcfg = *((volatile unsigned long*)(EP93XX_APB_HWBASE
+ devcfg = *((volatile unsigned long*)(EP93XX_APB_HWBASE
+ EP93XX_APB_SYSCON
+ EP93XX_SYSCON_DeviceCfg));
for (armadillo_model = &armadillo_model_table[0];
@@ -625,20 +625,20 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa,
- irqstack.pv_va);
+ irqstack.pv_va);
printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa,
- abtstack.pv_va);
+ abtstack.pv_va);
printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa,
- undstack.pv_va);
+ undstack.pv_va);
printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa,
- kernelstack.pv_va);
+ kernelstack.pv_va);
#endif
alloc_pages(msgbufphys, round_page(MSGBUFSIZE) / PAGE_SIZE);
/*
* Ok we have allocated physical pages for the primary kernel
- * page tables. Save physical_freeend for when we give whats left
+ * page tables. Save physical_freeend for when we give whats left
* of memory below 2Mbyte to UVM.
*/
@@ -850,7 +850,7 @@ initarm(void *arg)
printf("isa ");
#endif
isa_armadillo9_init(ARMADILLO9_IO16_VBASE + ARMADILLO9_ISAIO,
- ARMADILLO9_IO16_VBASE + ARMADILLO9_ISAMEM);
+ ARMADILLO9_IO16_VBASE + ARMADILLO9_ISAMEM);
#endif
#ifdef VERBOSE_INIT_ARM
@@ -895,9 +895,9 @@ consinit(void)
pmap_devmap_register(armadillo9_devmap);
#if NEPCOM > 0
- bus_space_map(&ep93xx_bs_tag, EP93XX_APB_HWBASE + comaddr[CONUNIT],
+ bus_space_map(&ep93xx_bs_tag, EP93XX_APB_HWBASE + comaddr[CONUNIT],
EP93XX_APB_UART_SIZE, 0, &ioh);
- if (epcomcnattach(&ep93xx_bs_tag, EP93XX_APB_HWBASE + comaddr[CONUNIT],
+ if (epcomcnattach(&ep93xx_bs_tag, EP93XX_APB_HWBASE + comaddr[CONUNIT],
ioh, comcnspeed, comcnmode))
{
panic("can't init serial console");
@@ -925,7 +925,7 @@ ep93xx_bus_dma_init(struct arm32_bus_dma
for (i = 0; i < bootconfig.dramblocks; i++) {
armadillo9_dma_ranges[i].dr_sysbase = bootconfig.dram[i].address;
armadillo9_dma_ranges[i].dr_busbase = bootconfig.dram[i].address;
- armadillo9_dma_ranges[i].dr_len = bootconfig.dram[i].pages *
+ armadillo9_dma_ranges[i].dr_len = bootconfig.dram[i].pages *
PAGE_SIZE;
}
Index: src/sys/arch/evbarm/conf/GENERIC64
diff -u src/sys/arch/evbarm/conf/GENERIC64:1.152 src/sys/arch/evbarm/conf/GENERIC64:1.153
--- src/sys/arch/evbarm/conf/GENERIC64:1.152 Mon Apr 13 11:44:20 2020
+++ src/sys/arch/evbarm/conf/GENERIC64 Sat Apr 18 10:55:44 2020
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC64,v 1.152 2020/04/13 11:44:20 maxv Exp $
+# $NetBSD: GENERIC64,v 1.153 2020/04/18 10:55:44 skrll Exp $
#
# GENERIC ARM (aarch64) kernel
#
@@ -341,7 +341,7 @@ enet* at fdt? # IMX FEC
genet* at acpi? # Broadcom GENET v5
genet* at fdt?
#scx* at acpi? # Socionext Gigabit Ethernet
-#scx* at fdt?
+#scx* at fdt?
aq* at pci? dev ? function ? # Aquantia AQC 10 gigabit
ena* at pci? dev ? function ? # Amazon.com Elastic Network Adapter
mcx* at pci? dev ? function ? # Mellanox 5th generation Ethernet
Index: src/sys/arch/evbarm/conf/IYONIX
diff -u src/sys/arch/evbarm/conf/IYONIX:1.4 src/sys/arch/evbarm/conf/IYONIX:1.5
--- src/sys/arch/evbarm/conf/IYONIX:1.4 Wed Mar 25 17:06:18 2020
+++ src/sys/arch/evbarm/conf/IYONIX Sat Apr 18 10:55:44 2020
@@ -1,4 +1,4 @@
-# $NetBSD: IYONIX,v 1.4 2020/03/25 17:06:18 jdolecek Exp $
+# $NetBSD: IYONIX,v 1.5 2020/04/18 10:55:44 skrll Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.iyonix"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.4 $"
+#ident "GENERIC-$Revision: 1.5 $"
maxusers 32 # estimated number of users
@@ -189,7 +189,7 @@ cpu0 at mainbus?
iopxs* at mainbus?
iopaau* at iopxs? # Application Accelerator Unit
-iopiic* at iopxs? # I2C Controller Unit(s)
+iopiic* at iopxs? # I2C Controller Unit(s)
iic0 at iopiic?
iic1 at iopiic?
iopwdog* at iopxs? # Watchdog timer
Index: src/sys/arch/evbarm/conf/MARVELL_NAS
diff -u src/sys/arch/evbarm/conf/MARVELL_NAS:1.36 src/sys/arch/evbarm/conf/MARVELL_NAS:1.37
--- src/sys/arch/evbarm/conf/MARVELL_NAS:1.36 Wed Mar 25 17:06:18 2020
+++ src/sys/arch/evbarm/conf/MARVELL_NAS Sat Apr 18 10:55:44 2020
@@ -1,4 +1,4 @@
-# $NetBSD: MARVELL_NAS,v 1.36 2020/03/25 17:06:18 jdolecek Exp $
+# $NetBSD: MARVELL_NAS,v 1.37 2020/04/18 10:55:44 skrll Exp $
#
# This configuration supports for generically Marvell NAS.
@@ -214,7 +214,7 @@ umass* at uhub? port ? configuration ? i
uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter
ucom* at uplcom? portno ?
-# Wedge support
+# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.35 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.36
--- src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.35 Tue Jul 16 14:41:45 2019
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c Sat Apr 18 10:55:44 2020
@@ -1,7 +1,7 @@
-/* $NetBSD: g42xxeb_machdep.c,v 1.35 2019/07/16 14:41:45 skrll Exp $ */
+/* $NetBSD: g42xxeb_machdep.c,v 1.36 2020/04/18 10:55:44 skrll Exp $ */
/*
- * Copyright (c) 2002, 2003, 2004, 2005 Genetec Corporation.
+ * Copyright (c) 2002, 2003, 2004, 2005 Genetec Corporation.
* All rights reserved.
*
* Written by Hiroyuki Bessho for Genetec Corporation.
@@ -14,7 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. The name of Genetec Corporation may not be used to endorse or
+ * 3. The name of Genetec Corporation may not be used to endorse or
* promote products derived from this software without specific prior
* written permission.
*
@@ -30,9 +30,9 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * Machine dependent functions for kernel setup for Genetec G4250EBX
+ * Machine dependent functions for kernel setup for Genetec G4250EBX
* evaluation board.
- *
+ *
* Based on iq80310_machhdep.c
*/
/*
@@ -293,7 +293,7 @@ cpu_reboot(int howto, char *bootstr)
/* Do a dump if requested. */
if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
dumpsys();
-
+
/* Run any shutdown hooks */
doshutdownhooks();
@@ -443,8 +443,8 @@ initarm(void *arg)
/*
* Okay, RedBoot has provided us with the following memory map:
*
- * Physical Address Range Description
- * ----------------------- ----------------------------------
+ * Physical Address Range Description
+ * ----------------------- ----------------------------------
* 0x00000000 - 0x01ffffff flash Memory (32MB)
* 0x04000000 - 0x05ffffff Application flash Memory (32MB)
* 0x08000000 - 0x080000ff I/O baseboard registers
@@ -454,16 +454,16 @@ initarm(void *arg)
* 0xa0000000 - 0xa3ffffff SDRAM Bank 0 (64MB)
*
*
- * Virtual Address Range X C B Description
- * ----------------------- - - - ----------------------------------
- * 0x00000000 - 0x00003fff N Y Y SDRAM
+ * Virtual Address Range X C B Description
+ * ----------------------- - - - ----------------------------------
+ * 0x00000000 - 0x00003fff N Y Y SDRAM
* 0x00004000 - 0x01ffffff N Y N ROM
* 0x08000000 - 0x080fffff N N N I/O baseboard registers
* 0x0a000000 - 0x0a0fffff N N N SRAM
* 0x40000000 - 0x480fffff N N N Processor Registers
- * 0xa0000000 - 0xa000ffff N Y N RedBoot SDRAM
+ * 0xa0000000 - 0xa000ffff N Y N RedBoot SDRAM
* 0xa0017000 - 0xa3ffffff Y Y Y SDRAM
- * 0xc0000000 - 0xcfffffff Y Y Y Cache Flush Region
+ * 0xc0000000 - 0xcfffffff Y Y Y Cache Flush Region
* (done by this routine)
* 0xfd000000 - 0xfd0000ff N N N I/O baseboard registers
* 0xfd100000 - 0xfd3fffff N N N Processor Registers.
@@ -622,13 +622,13 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa,
- irqstack.pv_va);
+ irqstack.pv_va);
printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa,
- abtstack.pv_va);
+ abtstack.pv_va);
printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa,
- undstack.pv_va);
+ undstack.pv_va);
printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa,
- kernelstack.pv_va);
+ kernelstack.pv_va);
#endif
/*
@@ -680,7 +680,7 @@ initarm(void *arg)
textsize = (textsize + PGOFSET) & ~PGOFSET;
totalsize = (totalsize + PGOFSET) & ~PGOFSET;
-
+
logical = 0x00200000; /* offset of kernel in RAM */
logical += pmap_map_chunk(l1pagetable, KERNEL_BASE + logical,
@@ -953,9 +953,9 @@ consinit(void)
#ifdef KGDB
if (0 == strcmp(kgdb_devname, "ffuart")){
/* port is reserved for kgdb */
- } else
+ } else
#endif
- if (0 == comcnattach(&pxa2x0_a4x_bs_tag, PXA2X0_FFUART_BASE,
+ if (0 == comcnattach(&pxa2x0_a4x_bs_tag, PXA2X0_FFUART_BASE,
comcnspeed, PXA2X0_COM_FREQ, COM_TYPE_PXA2x0, comcnmode)) {
#if 0
pxa2x0_clkman_config(CKEN_FFUART, 1);
Index: src/sys/arch/evbarm/hdl_g/hdlg_machdep.c
diff -u src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.28 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.29
--- src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.28 Tue Jul 16 14:41:45 2019
+++ src/sys/arch/evbarm/hdl_g/hdlg_machdep.c Sat Apr 18 10:55:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hdlg_machdep.c,v 1.28 2019/07/16 14:41:45 skrll Exp $ */
+/* $NetBSD: hdlg_machdep.c,v 1.29 2020/04/18 10:55:44 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.28 2019/07/16 14:41:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.29 2020/04/18 10:55:44 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -160,7 +160,7 @@ extern int pmap_debug_level;
/* L2 table for mapping i80321 */
#define KERNEL_PT_IOPXS (KERNEL_PT_KERNEL + KERNEL_PT_KERNEL_NUM)
- /* L2 tables for mapping kernel VM */
+ /* L2 tables for mapping kernel VM */
#define KERNEL_PT_VMDATA (KERNEL_PT_IOPXS + 1)
#define KERNEL_PT_VMDATA_NUM 4 /* start with 16MB of KVM */
#define NUM_KERNEL_PTS (KERNEL_PT_VMDATA + KERNEL_PT_VMDATA_NUM)
@@ -392,13 +392,13 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa,
- irqstack.pv_va);
+ irqstack.pv_va);
printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa,
- abtstack.pv_va);
+ abtstack.pv_va);
printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa,
- undstack.pv_va);
+ undstack.pv_va);
printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa,
- kernelstack.pv_va);
+ kernelstack.pv_va);
#endif
/*
@@ -452,7 +452,7 @@ initarm(void *arg)
textsize = (textsize + PGOFSET) & ~PGOFSET;
totalsize = (totalsize + PGOFSET) & ~PGOFSET;
-
+
logical = 0x00200000; /* offset of kernel in RAM */
logical += pmap_map_chunk(l1pagetable, KERNEL_BASE + logical,
Index: src/sys/arch/evbarm/imx31/imx31lk_machdep.c
diff -u src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.26 src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.27
--- src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.26 Tue Jul 16 14:41:45 2019
+++ src/sys/arch/evbarm/imx31/imx31lk_machdep.c Sat Apr 18 10:55:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: imx31lk_machdep.c,v 1.26 2019/07/16 14:41:45 skrll Exp $ */
+/* $NetBSD: imx31lk_machdep.c,v 1.27 2020/04/18 10:55:44 skrll Exp $ */
/*
* Startup routines for the ZOOM iMX31 LITEKIT.
@@ -17,7 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. The name of Genetec Corporation may not be used to endorse or
+ * 3. The name of Genetec Corporation may not be used to endorse or
* promote products derived from this software without specific prior
* written permission.
*
@@ -33,7 +33,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * Machine dependent functions for kernel setup for
+ * Machine dependent functions for kernel setup for
* Intel DBPXA250 evaluation board (a.k.a. Lubbock).
* Based on iq80310_machhdep.c
*/
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.26 2019/07/16 14:41:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.27 2020/04/18 10:55:44 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -277,7 +277,7 @@ cpu_reboot(int howto, char *bootstr)
/* Do a dump if requested. */
if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
dumpsys();
-
+
/* Run any shutdown hooks */
doshutdownhooks();
@@ -496,13 +496,13 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa,
- irqstack.pv_va);
+ irqstack.pv_va);
printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa,
- abtstack.pv_va);
+ abtstack.pv_va);
printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa,
- undstack.pv_va);
+ undstack.pv_va);
printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa,
- kernelstack.pv_va);
+ kernelstack.pv_va);
#endif
/*
@@ -559,7 +559,7 @@ printf("%s: etext %lx, _end %lx\n",
__func__, (uintptr_t)etext, (uintptr_t)_end);
printf("%s: textsize %#lx, totalsize %#lx\n",
__func__, textsize, totalsize);
-
+
logical = 0x00100000; /* offset of kernel in RAM */
/* Map text section read-only. */
Index: src/sys/arch/evbarm/integrator/integrator_machdep.c
diff -u src/sys/arch/evbarm/integrator/integrator_machdep.c:1.77 src/sys/arch/evbarm/integrator/integrator_machdep.c:1.78
--- src/sys/arch/evbarm/integrator/integrator_machdep.c:1.77 Tue Jul 16 14:41:46 2019
+++ src/sys/arch/evbarm/integrator/integrator_machdep.c Sat Apr 18 10:55:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: integrator_machdep.c,v 1.77 2019/07/16 14:41:46 skrll Exp $ */
+/* $NetBSD: integrator_machdep.c,v 1.78 2020/04/18 10:55:44 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.77 2019/07/16 14:41:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.78 2020/04/18 10:55:44 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -242,7 +242,7 @@ cpu_reboot(int howto, char *bootstr)
/* Do a dump if requested. */
if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
dumpsys();
-
+
/* Run any shutdown hooks */
doshutdownhooks();
@@ -449,7 +449,7 @@ consinit(void)
static void
integrator_sdram_bounds(paddr_t *memstart, psize_t *memsize)
{
- volatile unsigned long *cm_sdram
+ volatile unsigned long *cm_sdram
= (volatile unsigned long *)0x10000020;
volatile unsigned long *cm_stat
= (volatile unsigned long *)0x10000010;
Index: src/sys/arch/evbarm/iq80310/iq80310_machdep.c
diff -u src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.91 src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.92
--- src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.91 Tue Jul 16 14:41:46 2019
+++ src/sys/arch/evbarm/iq80310/iq80310_machdep.c Sat Apr 18 10:55:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_machdep.c,v 1.91 2019/07/16 14:41:46 skrll Exp $ */
+/* $NetBSD: iq80310_machdep.c,v 1.92 2020/04/18 10:55:44 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.91 2019/07/16 14:41:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.92 2020/04/18 10:55:44 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -159,7 +159,7 @@ extern int pmap_debug_level;
/* L2 table for mapping i80312 */
#define KERNEL_PT_IOPXS (KERNEL_PT_KERNEL + KERNEL_PT_KERNEL_NUM)
- /* L2 tables for mapping kernel VM */
+ /* L2 tables for mapping kernel VM */
#define KERNEL_PT_VMDATA (KERNEL_PT_IOPXS + 1)
#define KERNEL_PT_VMDATA_NUM 4 /* start with 16MB of KVM */
#define NUM_KERNEL_PTS (KERNEL_PT_VMDATA + KERNEL_PT_VMDATA_NUM)
@@ -241,7 +241,7 @@ cpu_reboot(int howto, char *bootstr)
/* Do a dump if requested. */
if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
dumpsys();
-
+
/* Run any shutdown hooks */
doshutdownhooks();
@@ -514,13 +514,13 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa,
- irqstack.pv_va);
+ irqstack.pv_va);
printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa,
- abtstack.pv_va);
+ abtstack.pv_va);
printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa,
- undstack.pv_va);
+ undstack.pv_va);
printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa,
- kernelstack.pv_va);
+ kernelstack.pv_va);
#endif
/*
@@ -574,7 +574,7 @@ initarm(void *arg)
textsize = (textsize + PGOFSET) & ~PGOFSET;
totalsize = (totalsize + PGOFSET) & ~PGOFSET;
-
+
logical = 0x00200000; /* offset of kernel in RAM */
logical += pmap_map_chunk(l1pagetable, KERNEL_BASE + logical,
Index: src/sys/arch/evbarm/iq80321/iq80321_machdep.c
diff -u src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.61 src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.62
--- src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.61 Tue Jul 16 14:41:46 2019
+++ src/sys/arch/evbarm/iq80321/iq80321_machdep.c Sat Apr 18 10:55:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80321_machdep.c,v 1.61 2019/07/16 14:41:46 skrll Exp $ */
+/* $NetBSD: iq80321_machdep.c,v 1.62 2020/04/18 10:55:45 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.61 2019/07/16 14:41:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.62 2020/04/18 10:55:45 skrll Exp $");
#include "opt_console.h"
#include "opt_ddb.h"
@@ -161,7 +161,7 @@ extern int pmap_debug_level;
/* L2 table for mapping i80321 */
#define KERNEL_PT_IOPXS (KERNEL_PT_KERNEL + KERNEL_PT_KERNEL_NUM)
- /* L2 tables for mapping kernel VM */
+ /* L2 tables for mapping kernel VM */
#define KERNEL_PT_VMDATA (KERNEL_PT_IOPXS + 1)
#define KERNEL_PT_VMDATA_NUM 4 /* start with 16MB of KVM */
#define NUM_KERNEL_PTS (KERNEL_PT_VMDATA + KERNEL_PT_VMDATA_NUM)
@@ -268,7 +268,7 @@ cpu_reboot(int howto, char *bootstr)
/* Do a dump if requested. */
if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
dumpsys();
-
+
/* Run any shutdown hooks */
doshutdownhooks();
@@ -538,13 +538,13 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa,
- irqstack.pv_va);
+ irqstack.pv_va);
printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa,
- abtstack.pv_va);
+ abtstack.pv_va);
printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa,
- undstack.pv_va);
+ undstack.pv_va);
printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa,
- kernelstack.pv_va);
+ kernelstack.pv_va);
#endif
/*
@@ -598,7 +598,7 @@ initarm(void *arg)
textsize = (textsize + PGOFSET) & ~PGOFSET;
totalsize = (totalsize + PGOFSET) & ~PGOFSET;
-
+
logical = 0x00200000; /* offset of kernel in RAM */
logical += pmap_map_chunk(l1pagetable, KERNEL_BASE + logical,
Index: src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
diff -u src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.43 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.44
--- src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.43 Tue Jul 16 14:41:46 2019
+++ src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c Sat Apr 18 10:55:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ixdp425_machdep.c,v 1.43 2019/07/16 14:41:46 skrll Exp $ */
+/* $NetBSD: ixdp425_machdep.c,v 1.44 2020/04/18 10:55:45 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.43 2019/07/16 14:41:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.44 2020/04/18 10:55:45 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -149,7 +149,7 @@ extern int pmap_debug_level;
#define KERNEL_PT_KERNEL 1 /* L2 table for mapping kernel */
#define KERNEL_PT_KERNEL_NUM 4
#define KERNEL_PT_IO (KERNEL_PT_KERNEL + KERNEL_PT_KERNEL_NUM)
- /* L2 tables for mapping kernel VM */
+ /* L2 tables for mapping kernel VM */
#define KERNEL_PT_VMDATA (KERNEL_PT_IO + 1)
#define KERNEL_PT_VMDATA_NUM 4 /* start with 16MB of KVM */
#define NUM_KERNEL_PTS (KERNEL_PT_VMDATA + KERNEL_PT_VMDATA_NUM)
@@ -253,7 +253,7 @@ cpu_reboot(int howto, char *bootstr)
/* Do a dump if requested. */
if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
dumpsys();
-
+
/* Run any shutdown hooks */
doshutdownhooks();
@@ -507,13 +507,13 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa,
- irqstack.pv_va);
+ irqstack.pv_va);
printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa,
- abtstack.pv_va);
+ abtstack.pv_va);
printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa,
- undstack.pv_va);
+ undstack.pv_va);
printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa,
- kernelstack.pv_va);
+ kernelstack.pv_va);
#endif
/*
@@ -568,7 +568,7 @@ initarm(void *arg)
textsize = (textsize + PGOFSET) & ~PGOFSET;
totalsize = (totalsize + PGOFSET) & ~PGOFSET;
-
+
logical = 0x00200000; /* offset of kernel in RAM */
logical += pmap_map_chunk(l1pagetable, KERNEL_BASE + logical,
Index: src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
diff -u src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.63 src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.64
--- src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.63 Tue Jul 16 14:41:46 2019
+++ src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c Sat Apr 18 10:55:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ixm1200_machdep.c,v 1.63 2019/07/16 14:41:46 skrll Exp $ */
+/* $NetBSD: ixm1200_machdep.c,v 1.64 2020/04/18 10:55:45 skrll Exp $ */
/*
* Copyright (c) 2002, 2003
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.63 2019/07/16 14:41:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.64 2020/04/18 10:55:45 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -169,7 +169,7 @@ extern int pmap_debug_level;
#define KERNEL_PT_SYS 0 /* Page table for mapping proc0 zero page */
#define KERNEL_PT_KERNEL 1 /* Page table for mapping kernel */
-#define KERNEL_PT_KERNEL_NUM 2
+#define KERNEL_PT_KERNEL_NUM 2
#define KERNEL_PT_IO (KERNEL_PT_KERNEL + KERNEL_PT_KERNEL_NUM)
/* Page table for mapping IO */
#define KERNEL_PT_VMDATA (KERNEL_PT_IO + 1)
@@ -453,10 +453,10 @@ initarm(void *arg)
valloc_pages(kernelstack, UPAGES);
#ifdef VERBOSE_INIT_ARM
- printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa, irqstack.pv_va);
- printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa, abtstack.pv_va);
- printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa, undstack.pv_va);
- printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa, kernelstack.pv_va);
+ printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa, irqstack.pv_va);
+ printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa, abtstack.pv_va);
+ printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa, undstack.pv_va);
+ printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa, kernelstack.pv_va);
#endif
alloc_pages(msgbufphys, round_page(MSGBUFSIZE) / PAGE_SIZE);
@@ -524,7 +524,7 @@ initarm(void *arg)
textsize = (textsize + PGOFSET) & ~PGOFSET;
totalsize = (totalsize + PGOFSET) & ~PGOFSET;
-
+
logical = 0x00200000; /* offset of kernel in RAM */
logical += pmap_map_chunk(l1pagetable, KERNEL_BASE + logical,
@@ -583,7 +583,7 @@ initarm(void *arg)
/*
* Map the Dcache Flush page.
- * Hw Ref Manual 3.2.4.5 Software Dcache Flush
+ * Hw Ref Manual 3.2.4.5 Software Dcache Flush
*/
pmap_map_chunk(l1pagetable, ixp12x0_cache_clean_addr, 0xe0000000,
CPU_IXP12X0_CACHE_CLEAN_SIZE, VM_PROT_READ, PTE_CACHE);
Index: src/sys/arch/evbarm/iyonix/iyonix_machdep.c
diff -u src/sys/arch/evbarm/iyonix/iyonix_machdep.c:1.2 src/sys/arch/evbarm/iyonix/iyonix_machdep.c:1.3
--- src/sys/arch/evbarm/iyonix/iyonix_machdep.c:1.2 Tue Jul 16 14:41:46 2019
+++ src/sys/arch/evbarm/iyonix/iyonix_machdep.c Sat Apr 18 10:55:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: iyonix_machdep.c,v 1.2 2019/07/16 14:41:46 skrll Exp $ */
+/* $NetBSD: iyonix_machdep.c,v 1.3 2020/04/18 10:55:45 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.2 2019/07/16 14:41:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.3 2020/04/18 10:55:45 skrll Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -178,7 +178,7 @@ extern int pmap_debug_level;
/* L2 table for mapping i80321 */
#define KERNEL_PT_IOPXS (KERNEL_PT_KERNEL + KERNEL_PT_KERNEL_NUM)
- /* L2 tables for mapping kernel VM */
+ /* L2 tables for mapping kernel VM */
#define KERNEL_PT_VMDATA (KERNEL_PT_IOPXS + 1)
#define KERNEL_PT_VMDATA_NUM 4 /* start with 16MB of KVM */
#define NUM_KERNEL_PTS (KERNEL_PT_VMDATA + KERNEL_PT_VMDATA_NUM)
@@ -302,7 +302,7 @@ cpu_reboot(int howto, char *bootstr)
/* Do a dump if requested. */
if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
dumpsys();
-
+
/* Run any shutdown hooks */
doshutdownhooks();
@@ -609,13 +609,13 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa,
- irqstack.pv_va);
+ irqstack.pv_va);
printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa,
- abtstack.pv_va);
+ abtstack.pv_va);
printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa,
- undstack.pv_va);
+ undstack.pv_va);
printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa,
- kernelstack.pv_va);
+ kernelstack.pv_va);
#endif
alloc_pages(msgbufphys, round_page(MSGBUFSIZE) / PAGE_SIZE);
@@ -665,7 +665,7 @@ initarm(void *arg)
textsize = (textsize + PGOFSET) & ~PGOFSET;
totalsize = (totalsize + PGOFSET) & ~PGOFSET;
-
+
logical = 0; /* offset of kernel in RAM */
logical += pmap_map_chunk(l1pagetable, KERNEL_BASE + logical,
physical_start + logical, textsize,
@@ -847,7 +847,7 @@ consinit(void)
strncmp(boot_consdev, "com", 3))
strcpy(boot_consdev, DEFAULT_CONSDEV);
- if (!strncmp(boot_consdev, "com", 3))
+ if (!strncmp(boot_consdev, "com", 3))
consinit_com(boot_consdev);
else
consinit_genfb(boot_consdev);
Index: src/sys/arch/evbarm/lubbock/lubbock_machdep.c
diff -u src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.39 src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.40
--- src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.39 Tue Jul 16 14:41:47 2019
+++ src/sys/arch/evbarm/lubbock/lubbock_machdep.c Sat Apr 18 10:55:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lubbock_machdep.c,v 1.39 2019/07/16 14:41:47 skrll Exp $ */
+/* $NetBSD: lubbock_machdep.c,v 1.40 2020/04/18 10:55:45 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -12,7 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. The name of Genetec Corporation may not be used to endorse or
+ * 3. The name of Genetec Corporation may not be used to endorse or
* promote products derived from this software without specific prior
* written permission.
*
@@ -28,7 +28,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * Machine dependent functions for kernel setup for
+ * Machine dependent functions for kernel setup for
* Intel DBPXA250 evaluation board (a.k.a. Lubbock).
* Based on iq80310_machhdep.c
*/
@@ -112,7 +112,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.39 2019/07/16 14:41:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.40 2020/04/18 10:55:45 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -305,7 +305,7 @@ cpu_reboot(int howto, char *bootstr)
/* Do a dump if requested. */
if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
dumpsys();
-
+
/* Run any shutdown hooks */
doshutdownhooks();
@@ -459,8 +459,8 @@ initarm(void *arg)
/*
* Okay, RedBoot has provided us with the following memory map:
*
- * Physical Address Range Description
- * ----------------------- ----------------------------------
+ * Physical Address Range Description
+ * ----------------------- ----------------------------------
* 0x00000000 - 0x01ffffff flash Memory (32MB)
* 0x04000000 - 0x05ffffff Application flash Memory (32MB)
* 0x08000000 - 0x080000ff I/O baseboard registers
@@ -473,18 +473,18 @@ initarm(void *arg)
* 0xa0000000 - 0xa3ffffff SDRAM Bank 0 (64MB)
*
*
- * Virtual Address Range X C B Description
- * ----------------------- - - - ----------------------------------
- * 0x00000000 - 0x00003fff N Y Y SDRAM
+ * Virtual Address Range X C B Description
+ * ----------------------- - - - ----------------------------------
+ * 0x00000000 - 0x00003fff N Y Y SDRAM
* 0x00004000 - 0x000fffff N Y N Boot ROM
* 0x00100000 - 0x01ffffff N N N Application Flash
* 0x04000000 - 0x05ffffff N N N Exp Application Flash
* 0x08000000 - 0x080fffff N N N I/O baseboard registers
* 0x0a000000 - 0x0a0fffff N N N SRAM
* 0x40000000 - 0x480fffff N N N Processor Registers
- * 0xa0000000 - 0xa000ffff N Y N RedBoot SDRAM
+ * 0xa0000000 - 0xa000ffff N Y N RedBoot SDRAM
* 0xa0017000 - 0xa3ffffff Y Y Y SDRAM
- * 0xc0000000 - 0xcfffffff Y Y Y Cache Flush Region
+ * 0xc0000000 - 0xcfffffff Y Y Y Cache Flush Region
* (done by this routine)
* 0xfd000000 - 0xfd0000ff N N N I/O baseboard registers
* 0xfd100000 - 0xfd3fffff N N N Processor Registers.
@@ -524,7 +524,7 @@ initarm(void *arg)
{
/* Modify access timing for CS3 (91c96) */
- uint32_t tmp =
+ uint32_t tmp =
ioreg_read(PXA2X0_MEMCTL_BASE+MEMCTL_MSC1);
ioreg_write(PXA2X0_MEMCTL_BASE+MEMCTL_MSC1,
(tmp & 0xffff) | (0x3881<<16));
@@ -563,7 +563,7 @@ initarm(void *arg)
{
int processor_card_id;
- processor_card_id = 0x000f &
+ processor_card_id = 0x000f &
ioreg_read(LUBBOCK_OBIO_VBASE+LUBBOCK_MISCRD);
switch(processor_card_id){
case 0:
@@ -699,13 +699,13 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa,
- irqstack.pv_va);
+ irqstack.pv_va);
printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa,
- abtstack.pv_va);
+ abtstack.pv_va);
printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa,
- undstack.pv_va);
+ undstack.pv_va);
printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa,
- kernelstack.pv_va);
+ kernelstack.pv_va);
#endif
/*
@@ -757,7 +757,7 @@ initarm(void *arg)
textsize = (textsize + PGOFSET) & ~PGOFSET;
totalsize = (totalsize + PGOFSET) & ~PGOFSET;
-
+
logical = 0x00200000; /* offset of kernel in RAM */
logical += pmap_map_chunk(l1pagetable, KERNEL_BASE + logical,
@@ -1022,7 +1022,7 @@ consinit(void)
/* port is reserved for kgdb */
}
#endif
- else if (0 == comcnattach(&pxa2x0_a4x_bs_tag, PXA2X0_FFUART_BASE,
+ else if (0 == comcnattach(&pxa2x0_a4x_bs_tag, PXA2X0_FFUART_BASE,
comcnspeed, PXA2X0_COM_FREQ, COM_TYPE_PXA2x0, comcnmode)) {
#if 0
/* XXX: can't call pxa2x0_clkman_config yet */
Index: src/sys/arch/evbarm/mini2440/mini2440_machdep.c
diff -u src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.16 src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.17
--- src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.16 Sun Nov 10 21:16:26 2019
+++ src/sys/arch/evbarm/mini2440/mini2440_machdep.c Sat Apr 18 10:55:45 2020
@@ -131,7 +131,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mini2440_machdep.c,v 1.16 2019/11/10 21:16:26 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mini2440_machdep.c,v 1.17 2020/04/18 10:55:45 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -546,7 +546,7 @@ initarm(void *arg)
/*
* Set up the variables that define the availablilty of
- * physical memory.
+ * physical memory.
* We use the 2MB between the physical start and the kernel to
* begin with. Allocating from 0x30200000 and downwards
* If we get too close to the bottom of SDRAM, we
Index: src/sys/arch/evbarm/mmnet/mmnet_machdep.c
diff -u src/sys/arch/evbarm/mmnet/mmnet_machdep.c:1.4 src/sys/arch/evbarm/mmnet/mmnet_machdep.c:1.5
--- src/sys/arch/evbarm/mmnet/mmnet_machdep.c:1.4 Tue Jul 16 14:41:47 2019
+++ src/sys/arch/evbarm/mmnet/mmnet_machdep.c Sat Apr 18 10:55:45 2020
@@ -1,5 +1,5 @@
-/* $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 $ */
+/* $Id: mmnet_machdep.c,v 1.5 2020/04/18 10:55:45 skrll Exp $ */
+/* $NetBSD: mmnet_machdep.c,v 1.5 2020/04/18 10:55:45 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.4 2019/07/16 14:41:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mmnet_machdep.c,v 1.5 2020/04/18 10:55:45 skrll Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -195,7 +195,7 @@ cpu_reboot(int howto, char *bootstr)
/* Do a dump if requested. */
if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
dumpsys();
-
+
/* Run any shutdown hooks */
doshutdownhooks();
@@ -282,7 +282,7 @@ at91_bus_dma_init(struct arm32_bus_dma_t
for (i = 0; i < bootconfig.dramblocks; i++) {
mmnet_dma_ranges[i].dr_sysbase = bootconfig.dram[i].address;
mmnet_dma_ranges[i].dr_busbase = bootconfig.dram[i].address;
- mmnet_dma_ranges[i].dr_len = bootconfig.dram[i].pages *
+ mmnet_dma_ranges[i].dr_len = bootconfig.dram[i].pages *
PAGE_SIZE;
}
Index: src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c
diff -u src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c:1.11 src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c:1.12
--- src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c:1.11 Tue Jul 16 14:41:47 2019
+++ src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c Sat Apr 18 10:55:45 2020
@@ -1,5 +1,5 @@
-/* $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 $ */
+/* $Id: mpcsa_machdep.c,v 1.12 2020/04/18 10:55:45 skrll Exp $ */
+/* $NetBSD: mpcsa_machdep.c,v 1.12 2020/04/18 10:55:45 skrll Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpcsa_machdep.c,v 1.11 2019/07/16 14:41:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpcsa_machdep.c,v 1.12 2020/04/18 10:55:45 skrll Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -218,7 +218,7 @@ cpu_reboot(int howto, char *bootstr)
/* Do a dump if requested. */
if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
dumpsys();
-
+
/* Run any shutdown hooks */
doshutdownhooks();
@@ -305,7 +305,7 @@ at91_bus_dma_init(struct arm32_bus_dma_t
for (i = 0; i < bootconfig.dramblocks; i++) {
mpcsa_dma_ranges[i].dr_sysbase = bootconfig.dram[i].address;
mpcsa_dma_ranges[i].dr_busbase = bootconfig.dram[i].address;
- mpcsa_dma_ranges[i].dr_len = bootconfig.dram[i].pages *
+ mpcsa_dma_ranges[i].dr_len = bootconfig.dram[i].pages *
PAGE_SIZE;
}
Index: src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
diff -u src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.26 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.27
--- src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.26 Tue Jul 16 14:41:48 2019
+++ src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c Sat Apr 18 10:55:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: npwr_fc_machdep.c,v 1.26 2019/07/16 14:41:48 skrll Exp $ */
+/* $NetBSD: npwr_fc_machdep.c,v 1.27 2020/04/18 10:55:46 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.26 2019/07/16 14:41:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.27 2020/04/18 10:55:46 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -161,7 +161,7 @@ extern int pmap_debug_level;
/* L2 table for mapping i80321 */
#define KERNEL_PT_IOPXS (KERNEL_PT_KERNEL + KERNEL_PT_KERNEL_NUM)
- /* L2 tables for mapping kernel VM */
+ /* L2 tables for mapping kernel VM */
#define KERNEL_PT_VMDATA (KERNEL_PT_IOPXS + 1)
#define KERNEL_PT_VMDATA_NUM 4 /* start with 16MB of KVM */
#define NUM_KERNEL_PTS (KERNEL_PT_VMDATA + KERNEL_PT_VMDATA_NUM)
@@ -264,7 +264,7 @@ cpu_reboot(int howto, char *bootstr)
/* Do a dump if requested. */
if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
dumpsys();
-
+
/* Run any shutdown hooks */
doshutdownhooks();
@@ -509,13 +509,13 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa,
- irqstack.pv_va);
+ irqstack.pv_va);
printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa,
- abtstack.pv_va);
+ abtstack.pv_va);
printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa,
- undstack.pv_va);
+ undstack.pv_va);
printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa,
- kernelstack.pv_va);
+ kernelstack.pv_va);
#endif
/*
@@ -569,7 +569,7 @@ initarm(void *arg)
textsize = (textsize + PGOFSET) & ~PGOFSET;
totalsize = (totalsize + PGOFSET) & ~PGOFSET;
-
+
logical = 0x00200000; /* offset of kernel in RAM */
logical += pmap_map_chunk(l1pagetable, KERNEL_BASE + logical,
Index: src/sys/arch/evbarm/nslu2/nslu2_machdep.c
diff -u src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.32 src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.33
--- src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.32 Tue Jul 16 14:41:48 2019
+++ src/sys/arch/evbarm/nslu2/nslu2_machdep.c Sat Apr 18 10:55:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nslu2_machdep.c,v 1.32 2019/07/16 14:41:48 skrll Exp $ */
+/* $NetBSD: nslu2_machdep.c,v 1.33 2020/04/18 10:55:46 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.32 2019/07/16 14:41:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.33 2020/04/18 10:55:46 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -179,7 +179,7 @@ extern int pmap_debug_level;
#define KERNEL_PT_KERNEL 1 /* L2 table for mapping kernel */
#define KERNEL_PT_KERNEL_NUM 4
#define KERNEL_PT_IO (KERNEL_PT_KERNEL + KERNEL_PT_KERNEL_NUM)
- /* L2 tables for mapping kernel VM */
+ /* L2 tables for mapping kernel VM */
#define KERNEL_PT_VMDATA (KERNEL_PT_IO + 1)
#define KERNEL_PT_VMDATA_NUM 4 /* start with 16MB of KVM */
#define NUM_KERNEL_PTS (KERNEL_PT_VMDATA + KERNEL_PT_VMDATA_NUM)
@@ -281,7 +281,7 @@ cpu_reboot(int howto, char *bootstr)
/* Do a dump if requested. */
if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
dumpsys();
-
+
/* Run any shutdown hooks */
doshutdownhooks();
@@ -575,13 +575,13 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa,
- irqstack.pv_va);
+ irqstack.pv_va);
printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa,
- abtstack.pv_va);
+ abtstack.pv_va);
printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa,
- undstack.pv_va);
+ undstack.pv_va);
printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa,
- kernelstack.pv_va);
+ kernelstack.pv_va);
#endif
/*
@@ -636,7 +636,7 @@ initarm(void *arg)
textsize = (textsize + PGOFSET) & ~PGOFSET;
totalsize = (totalsize + PGOFSET) & ~PGOFSET;
-
+
logical = 0x00200000; /* offset of kernel in RAM */
logical += pmap_map_chunk(l1pagetable, KERNEL_BASE + logical,
Index: src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.42 src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.43
--- src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.42 Sun Nov 10 21:16:26 2019
+++ src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c Sat Apr 18 10:55:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2410_machdep.c,v 1.42 2019/11/10 21:16:26 chs Exp $ */
+/* $NetBSD: smdk2410_machdep.c,v 1.43 2020/04/18 10:55:46 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.42 2019/11/10 21:16:26 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.43 2020/04/18 10:55:46 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -438,9 +438,9 @@ initarm(void *arg)
* memory controller is set correctly. (USB download firmware
* doesn't do this right) Also, we use WAIT signal for them.
*/
- ioreg_write32(S3C2410_MEMCTL_BASE + MEMCTL_BWSCON,
+ ioreg_write32(S3C2410_MEMCTL_BASE + MEMCTL_BWSCON,
(BWSCON_ST|BWSCON_WS) << BWSCON_BANK_SHIFT(2) |
- (BWSCON_ST|BWSCON_WS) << BWSCON_BANK_SHIFT(3) |
+ (BWSCON_ST|BWSCON_WS) << BWSCON_BANK_SHIFT(3) |
ioreg_read32(S3C2410_MEMCTL_BASE + MEMCTL_BWSCON));
/* tweak access timing for CS8900A */
ioreg_write32(S3C2410_MEMCTL_BASE + MEMCTL_BANKCON(3),
@@ -539,7 +539,7 @@ initarm(void *arg)
#else
/* Reserve physmem for ram disk */
md_root_start = ((physical_end - MD_ROOT_SIZE) & ~(L1_S_SIZE-1));
- printf("Reserve %ld bytes for memory disk\n",
+ printf("Reserve %ld bytes for memory disk\n",
physical_end - md_root_start);
/* copy fs contents */
memcpy((void *)md_root_start, (void *)MEMORY_DISK_ROOT_ADDR,
@@ -875,7 +875,7 @@ initarm(void *arg)
#endif
{
uint8_t gpio = ~gpio_read8(GPIO_PFDAT);
-
+
if (gpio & (1<<0)) /* SW1 (EINT0) */
boothowto ^= RB_SINGLE;
if (gpio & (1<<2)) /* SW2 (EINT2) */
Index: src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.47 src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.48
--- src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.47 Tue Jul 16 14:41:48 2019
+++ src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c Sat Apr 18 10:55:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2800_machdep.c,v 1.47 2019/07/16 14:41:48 skrll Exp $ */
+/* $NetBSD: smdk2800_machdep.c,v 1.48 2020/04/18 10:55:46 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.47 2019/07/16 14:41:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.48 2020/04/18 10:55:46 skrll Exp $");
#include "opt_ddb.h"
#include "opt_console.h"
@@ -442,7 +442,7 @@ initarm(void *arg)
#else
/* Reserve physmem for ram disk */
md_root_start = ((physical_end - MD_ROOT_SIZE) & ~(L1_S_SIZE-1));
- printf("Reserve %ld bytes for memory disk\n",
+ printf("Reserve %ld bytes for memory disk\n",
physical_end - md_root_start);
/* copy fs contents */
memcpy((void *)md_root_start, (void *)MEMORY_DISK_ROOT_ADDR,
@@ -791,7 +791,7 @@ initarm(void *arg)
#endif
{
uint8_t gpio = ~gpio8(GPIO_PDATF);
-
+
if (gpio & (1<<5)) /* SW3 */
boothowto ^= RB_SINGLE;
if (gpio & (1<<7)) /* SW7 */
@@ -887,7 +887,7 @@ kgdb_port_init(void)
unit = 1;
if (unit >= 0) {
- s3c2800_clock_freq2(ioreg_vaddr(S3C2800_CLKMAN_BASE),
+ s3c2800_clock_freq2(ioreg_vaddr(S3C2800_CLKMAN_BASE),
NULL, NULL, &pclk);
s3c2800_sscom_kgdb_attach(&s3c2xx0_bs_tag,
Index: src/sys/arch/evbarm/tsarm/tsarm_machdep.c
diff -u src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.29 src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.30
--- src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.29 Tue Jul 16 14:41:48 2019
+++ src/sys/arch/evbarm/tsarm/tsarm_machdep.c Sat Apr 18 10:55:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tsarm_machdep.c,v 1.29 2019/07/16 14:41:48 skrll Exp $ */
+/* $NetBSD: tsarm_machdep.c,v 1.30 2020/04/18 10:55:46 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.29 2019/07/16 14:41:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.30 2020/04/18 10:55:46 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -162,7 +162,7 @@ paddr_t msgbufphys;
static struct arm32_dma_range tsarm_dma_ranges[4];
#if NISA > 0
-extern void isa_tsarm_init(u_int, u_int);
+extern void isa_tsarm_init(u_int, u_int);
#endif
#ifdef PMAP_DEBUG
@@ -173,7 +173,7 @@ extern int pmap_debug_level;
#define KERNEL_PT_KERNEL 1 /* L2 table for mapping kernel */
#define KERNEL_PT_KERNEL_NUM 4
- /* L2 tables for mapping kernel VM */
+ /* L2 tables for mapping kernel VM */
#define KERNEL_PT_VMDATA (KERNEL_PT_KERNEL + KERNEL_PT_KERNEL_NUM)
#define KERNEL_PT_VMDATA_NUM 4 /* start with 16MB of KVM */
@@ -265,7 +265,7 @@ cpu_reboot(int howto, char *bootstr)
/* Do a dump if requested. */
if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
dumpsys();
-
+
/* Run any shutdown hooks */
doshutdownhooks();
@@ -300,7 +300,7 @@ cpu_reboot(int howto, char *bootstr)
"mov r1, #0x1\n"
"strh r0, [%0]\n"
"strh r1, [%1]\n"
- :
+ :
: "r" (feed), "r" (ctrl)
: "r0", "r1"
);
@@ -411,7 +411,7 @@ initarm(void *arg)
* We are currently running with the MMU enabled
*/
-#ifdef FIXME
+#ifdef FIXME
/*
* Fetch the SDRAM start/size from the i80321 SDRAM configuration
* registers.
@@ -452,7 +452,7 @@ initarm(void *arg)
* XXX pmap_bootstrap() needs an enema.
*/
physical_start = bootconfig.dram[0].address;
- physical_end = bootconfig.dram[0].address +
+ physical_end = bootconfig.dram[0].address +
(bootconfig.dram[0].pages * PAGE_SIZE);
physical_freestart = 0x00009000UL;
@@ -538,20 +538,20 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa,
- irqstack.pv_va);
+ irqstack.pv_va);
printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa,
- abtstack.pv_va);
+ abtstack.pv_va);
printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa,
- undstack.pv_va);
+ undstack.pv_va);
printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa,
- kernelstack.pv_va);
+ kernelstack.pv_va);
#endif
alloc_pages(msgbufphys, round_page(MSGBUFSIZE) / PAGE_SIZE);
/*
* Ok we have allocated physical pages for the primary kernel
- * page tables. Save physical_freeend for when we give whats left
+ * page tables. Save physical_freeend for when we give whats left
* of memory below 2Mbyte to UVM.
*/
@@ -595,7 +595,7 @@ initarm(void *arg)
textsize = (textsize + PGOFSET) & ~PGOFSET;
totalsize = (totalsize + PGOFSET) & ~PGOFSET;
-
+
logical = 0x00200000; /* offset of kernel in RAM */
logical += pmap_map_chunk(l1pagetable, KERNEL_BASE + logical,
physical_start + logical, textsize,
@@ -736,9 +736,9 @@ initarm(void *arg)
0, atop(physical_freeend_low),
VM_FREELIST_DEFAULT);
/*
- * There is 32 Mb of memory on the TS-7200 in 4 8Mb chunks, so far
- * we've only been working with the first one mapped at 0x0. Tell
- * UVM about the others.
+ * There is 32 Mb of memory on the TS-7200 in 4 8Mb chunks, so far
+ * we've only been working with the first one mapped at 0x0. Tell
+ * UVM about the others.
*/
uvm_page_physload(atop(0x1000000), atop(0x1800000),
atop(0x1000000), atop(0x1800000),
@@ -751,7 +751,7 @@ initarm(void *arg)
VM_FREELIST_DEFAULT);
physmem = 0x2000000 / PAGE_SIZE;
-
+
/* Boot strap pmap telling it where managed kernel virtual memory is */
#ifdef VERBOSE_INIT_ARM
@@ -771,7 +771,7 @@ initarm(void *arg)
printf("isa ");
#endif
isa_tsarm_init(TS7XXX_IO16_VBASE + TS7XXX_ISAIO,
- TS7XXX_IO16_VBASE + TS7XXX_ISAMEM);
+ TS7XXX_IO16_VBASE + TS7XXX_ISAMEM);
#endif
#ifdef VERBOSE_INIT_ARM
@@ -811,7 +811,7 @@ consinit(void)
pmap_devmap_register(tsarm_devmap);
#if 0
isa_tsarm_init(TS7XXX_IO16_VBASE + TS7XXX_ISAIO,
- TS7XXX_IO16_VBASE + TS7XXX_ISAMEM);
+ TS7XXX_IO16_VBASE + TS7XXX_ISAMEM);
if (comcnattach(&isa_io_bs_tag, 0x3e8, comcnspeed,
COM_FREQ, COM_TYPE_NORMAL, comcnmode))
@@ -821,9 +821,9 @@ consinit(void)
#endif
#if NEPCOM > 0
- bus_space_map(&ep93xx_bs_tag, EP93XX_APB_HWBASE + EP93XX_APB_UART1,
+ bus_space_map(&ep93xx_bs_tag, EP93XX_APB_HWBASE + EP93XX_APB_UART1,
EP93XX_APB_UART_SIZE, 0, &ioh);
- if (epcomcnattach(&ep93xx_bs_tag, EP93XX_APB_HWBASE + EP93XX_APB_UART1,
+ if (epcomcnattach(&ep93xx_bs_tag, EP93XX_APB_HWBASE + EP93XX_APB_UART1,
ioh, comcnspeed, comcnmode))
{
panic("can't init serial console");
@@ -851,7 +851,7 @@ ep93xx_bus_dma_init(struct arm32_bus_dma
for (i = 0; i < bootconfig.dramblocks; i++) {
tsarm_dma_ranges[i].dr_sysbase = bootconfig.dram[i].address;
tsarm_dma_ranges[i].dr_busbase = bootconfig.dram[i].address;
- tsarm_dma_ranges[i].dr_len = bootconfig.dram[i].pages *
+ tsarm_dma_ranges[i].dr_len = bootconfig.dram[i].pages *
PAGE_SIZE;
}
Index: src/sys/arch/evbarm/viper/viper_machdep.c
diff -u src/sys/arch/evbarm/viper/viper_machdep.c:1.30 src/sys/arch/evbarm/viper/viper_machdep.c:1.31
--- src/sys/arch/evbarm/viper/viper_machdep.c:1.30 Tue Jul 16 14:41:48 2019
+++ src/sys/arch/evbarm/viper/viper_machdep.c Sat Apr 18 10:55:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: viper_machdep.c,v 1.30 2019/07/16 14:41:48 skrll Exp $ */
+/* $NetBSD: viper_machdep.c,v 1.31 2020/04/18 10:55:46 skrll Exp $ */
/*
* Startup routines for the Arcom Viper. Below you can trace the
@@ -19,7 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. The name of Genetec Corporation may not be used to endorse or
+ * 3. The name of Genetec Corporation may not be used to endorse or
* promote products derived from this software without specific prior
* written permission.
*
@@ -35,7 +35,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * Machine dependent functions for kernel setup for
+ * Machine dependent functions for kernel setup for
* Intel DBPXA250 evaluation board (a.k.a. Lubbock).
* Based on iq80310_machhdep.c
*/
@@ -112,7 +112,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.30 2019/07/16 14:41:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.31 2020/04/18 10:55:46 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -238,7 +238,7 @@ static struct pxa2x0_gpioconf boarddep_g
{ 44, GPIO_ALT_FN_1_IN }, /* BTCST */
{ 45, GPIO_ALT_FN_2_OUT }, /* BTRST */
- { -1 }
+ { -1 }
};
static struct pxa2x0_gpioconf *viper_gpioconf[] = {
pxa25x_com_btuart_gpioconf,
@@ -298,7 +298,7 @@ cpu_reboot(int howto, char *bootstr)
/* Do a dump if requested. */
if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
dumpsys();
-
+
/* Run any shutdown hooks */
doshutdownhooks();
@@ -549,13 +549,13 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa,
- irqstack.pv_va);
+ irqstack.pv_va);
printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa,
- abtstack.pv_va);
+ abtstack.pv_va);
printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa,
- undstack.pv_va);
+ undstack.pv_va);
printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa,
- kernelstack.pv_va);
+ kernelstack.pv_va);
#endif
/*
@@ -607,7 +607,7 @@ initarm(void *arg)
textsize = (textsize + PGOFSET) & ~PGOFSET;
totalsize = (totalsize + PGOFSET) & ~PGOFSET;
-
+
logical = 0x00200000; /* offset of kernel in RAM */
logical += pmap_map_chunk(l1pagetable, KERNEL_BASE + logical,
@@ -851,7 +851,7 @@ consinit(void)
/* port is reserved for kgdb */
} else
#endif
- if (0 == comcnattach(&pxa2x0_a4x_bs_tag, PXA2X0_FFUART_BASE,
+ if (0 == comcnattach(&pxa2x0_a4x_bs_tag, PXA2X0_FFUART_BASE,
comcnspeed, PXA2X0_COM_FREQ, COM_TYPE_PXA2x0, comcnmode)) {
#if 0
Index: src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.27 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.28
--- src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.27 Tue Jul 16 14:41:49 2019
+++ src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c Sat Apr 18 10:55:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_hpc_machdep.c,v 1.27 2019/07/16 14:41:49 skrll Exp $ */
+/* $NetBSD: pxa2x0_hpc_machdep.c,v 1.28 2020/04/18 10:55:46 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.27 2019/07/16 14:41:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.28 2020/04/18 10:55:46 skrll Exp $");
#include "opt_ddb.h"
#include "opt_dram_pages.h"
@@ -312,10 +312,10 @@ init_pxa2x0(int argc, char **argv, struc
physical_end = bootconfig.dram[bootconfig.dramblocks - 1].address
+ bootconfig.dram[bootconfig.dramblocks - 1].pages * PAGE_SIZE;
physical_freeend = physical_end;
-
+
for (loop = 0; loop < bootconfig.dramblocks; ++loop)
physmem += bootconfig.dram[loop].pages;
-
+
/* XXX handle UMA framebuffer memory */
freemempos = 0xa0009000UL;
@@ -395,13 +395,13 @@ init_pxa2x0(int argc, char **argv, struc
#ifdef VERBOSE_INIT_ARM
printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa,
- irqstack.pv_va);
+ irqstack.pv_va);
printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa,
- abtstack.pv_va);
+ abtstack.pv_va);
printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa,
- undstack.pv_va);
+ undstack.pv_va);
printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa,
- kernelstack.pv_va);
+ kernelstack.pv_va);
#endif
alloc_pages(msgbufphys, round_page(MSGBUFSIZE) / PAGE_SIZE);
@@ -566,7 +566,7 @@ init_pxa2x0(int argc, char **argv, struc
undefined_handler_address = (u_int)undefinedinstruction_bounce;
#ifdef DEBUG
printf("%08x %08x %08x\n", data_abort_handler_address,
- prefetch_abort_handler_address, undefined_handler_address);
+ prefetch_abort_handler_address, undefined_handler_address);
#endif
/* Initialize the undefined instruction handlers */
Index: src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.15 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.16
--- src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.15 Tue Jul 16 14:41:49 2019
+++ src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c Sat Apr 18 10:55:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sa11x0_hpc_machdep.c,v 1.15 2019/07/16 14:41:49 skrll Exp $ */
+/* $NetBSD: sa11x0_hpc_machdep.c,v 1.16 2020/04/18 10:55:46 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.15 2019/07/16 14:41:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.16 2020/04/18 10:55:46 skrll Exp $");
#include "opt_ddb.h"
#include "opt_dram_pages.h"
@@ -237,10 +237,10 @@ init_sa11x0(int argc, char **argv, struc
physical_end = bootconfig.dram[bootconfig.dramblocks - 1].address
+ bootconfig.dram[bootconfig.dramblocks - 1].pages * PAGE_SIZE;
physical_freeend = physical_end;
-
+
for (loop = 0; loop < bootconfig.dramblocks; ++loop)
physmem += bootconfig.dram[loop].pages;
-
+
/* XXX handle UMA framebuffer memory */
/* Use the first 256kB to allocate things */
@@ -313,13 +313,13 @@ init_sa11x0(int argc, char **argv, struc
#ifdef VERBOSE_INIT_ARM
printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa,
- irqstack.pv_va);
+ irqstack.pv_va);
printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa,
- abtstack.pv_va);
+ abtstack.pv_va);
printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa,
- undstack.pv_va);
+ undstack.pv_va);
printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa,
- kernelstack.pv_va);
+ kernelstack.pv_va);
#endif
alloc_pages(msgbufphys, round_page(MSGBUFSIZE) / PAGE_SIZE);
@@ -488,7 +488,7 @@ init_sa11x0(int argc, char **argv, struc
undefined_handler_address = (u_int)undefinedinstruction_bounce;
#ifdef DEBUG
printf("%08x %08x %08x\n", data_abort_handler_address,
- prefetch_abort_handler_address, undefined_handler_address);
+ prefetch_abort_handler_address, undefined_handler_address);
#endif
/* Initialize the undefined instruction handlers */
Index: src/sys/arch/iyonix/conf/GENERIC
diff -u src/sys/arch/iyonix/conf/GENERIC:1.109 src/sys/arch/iyonix/conf/GENERIC:1.110
--- src/sys/arch/iyonix/conf/GENERIC:1.109 Wed Mar 25 17:06:19 2020
+++ src/sys/arch/iyonix/conf/GENERIC Sat Apr 18 10:55:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.109 2020/03/25 17:06:19 jdolecek Exp $
+# $NetBSD: GENERIC,v 1.110 2020/04/18 10:55:46 skrll Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/iyonix/conf/std.iyonix"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.109 $"
+#ident "GENERIC-$Revision: 1.110 $"
maxusers 32 # estimated number of users
@@ -188,7 +188,7 @@ cpu0 at mainbus?
iopxs* at mainbus?
iopaau* at iopxs? # Application Accelerator Unit
-iopiic* at iopxs? # I2C Controller Unit(s)
+iopiic* at iopxs? # I2C Controller Unit(s)
iic0 at iopiic?
iic1 at iopiic?
iopwdog* at iopxs? # Watchdog timer
Index: src/sys/arch/iyonix/iyonix/iyonix_machdep.c
diff -u src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.28 src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.29
--- src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.28 Tue Jul 16 14:41:49 2019
+++ src/sys/arch/iyonix/iyonix/iyonix_machdep.c Sat Apr 18 10:55:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: iyonix_machdep.c,v 1.28 2019/07/16 14:41:49 skrll Exp $ */
+/* $NetBSD: iyonix_machdep.c,v 1.29 2020/04/18 10:55:47 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.28 2019/07/16 14:41:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.29 2020/04/18 10:55:47 skrll Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -162,7 +162,7 @@ extern int pmap_debug_level;
/* L2 table for mapping i80321 */
#define KERNEL_PT_IOPXS (KERNEL_PT_KERNEL + KERNEL_PT_KERNEL_NUM)
- /* L2 tables for mapping kernel VM */
+ /* L2 tables for mapping kernel VM */
#define KERNEL_PT_VMDATA (KERNEL_PT_IOPXS + 1)
#define KERNEL_PT_VMDATA_NUM 4 /* start with 16MB of KVM */
#define NUM_KERNEL_PTS (KERNEL_PT_VMDATA + KERNEL_PT_VMDATA_NUM)
@@ -286,7 +286,7 @@ cpu_reboot(int howto, char *bootstr)
/* Do a dump if requested. */
if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
dumpsys();
-
+
/* Run any shutdown hooks */
doshutdownhooks();
@@ -593,13 +593,13 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa,
- irqstack.pv_va);
+ irqstack.pv_va);
printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa,
- abtstack.pv_va);
+ abtstack.pv_va);
printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa,
- undstack.pv_va);
+ undstack.pv_va);
printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa,
- kernelstack.pv_va);
+ kernelstack.pv_va);
#endif
alloc_pages(msgbufphys, round_page(MSGBUFSIZE) / PAGE_SIZE);
@@ -649,7 +649,7 @@ initarm(void *arg)
textsize = (textsize + PGOFSET) & ~PGOFSET;
totalsize = (totalsize + PGOFSET) & ~PGOFSET;
-
+
logical = 0; /* offset of kernel in RAM */
logical += pmap_map_chunk(l1pagetable, KERNEL_BASE + logical,
physical_start + logical, textsize,
@@ -831,7 +831,7 @@ consinit(void)
strncmp(boot_consdev, "com", 3))
strcpy(boot_consdev, DEFAULT_CONSDEV);
- if (!strncmp(boot_consdev, "com", 3))
+ if (!strncmp(boot_consdev, "com", 3))
consinit_com(boot_consdev);
else
consinit_genfb(boot_consdev);
Index: src/sys/arch/netwinder/conf/GENERIC
diff -u src/sys/arch/netwinder/conf/GENERIC:1.137 src/sys/arch/netwinder/conf/GENERIC:1.138
--- src/sys/arch/netwinder/conf/GENERIC:1.137 Fri Apr 26 21:40:31 2019
+++ src/sys/arch/netwinder/conf/GENERIC Sat Apr 18 10:55:47 2020
@@ -1,7 +1,7 @@
-# $NetBSD: GENERIC,v 1.137 2019/04/26 21:40:31 sevan Exp $
+# $NetBSD: GENERIC,v 1.138 2020/04/18 10:55:47 skrll Exp $
#
# GENERIC machine description file
-#
+#
# This machine description file is used to generate the default NetBSD
# kernel. The generic kernel does not include all options, subsystems
# and device drivers, but should be useful for most applications.
Index: src/sys/arch/netwinder/netwinder/netwinder_machdep.c
diff -u src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.88 src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.89
--- src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.88 Tue Jul 16 14:41:49 2019
+++ src/sys/arch/netwinder/netwinder/netwinder_machdep.c Sat Apr 18 10:55:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: netwinder_machdep.c,v 1.88 2019/07/16 14:41:49 skrll Exp $ */
+/* $NetBSD: netwinder_machdep.c,v 1.89 2020/04/18 10:55:47 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.88 2019/07/16 14:41:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.89 2020/04/18 10:55:47 skrll Exp $");
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -270,7 +270,7 @@ cpu_reboot(int howto, char *bootstr)
/* Do a dump if requested. */
if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
dumpsys();
-
+
/* Run any shutdown hooks */
doshutdownhooks();
@@ -541,13 +541,13 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa,
- irqstack.pv_va);
+ irqstack.pv_va);
printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa,
- abtstack.pv_va);
+ abtstack.pv_va);
printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa,
- undstack.pv_va);
+ undstack.pv_va);
printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa,
- kernelstack.pv_va);
+ kernelstack.pv_va);
#endif
alloc_pages(msgbufphys, round_page(MSGBUFSIZE) / PAGE_SIZE);
@@ -903,7 +903,7 @@ consinit(void)
/*
* XXX: uwe: special case mapping for the igsfb memory space.
- *
+ *
* The problem with this is that when footbridge is
* attached during normal autoconfiguration the bus
* space tags will be reinited and these hooks lost.
Index: src/sys/arch/zaurus/zaurus/machdep.c
diff -u src/sys/arch/zaurus/zaurus/machdep.c:1.45 src/sys/arch/zaurus/zaurus/machdep.c:1.46
--- src/sys/arch/zaurus/zaurus/machdep.c:1.45 Wed Nov 13 17:59:56 2019
+++ src/sys/arch/zaurus/zaurus/machdep.c Sat Apr 18 10:55:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.45 2019/11/13 17:59:56 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.46 2020/04/18 10:55:47 skrll Exp $ */
/* $OpenBSD: zaurus_machdep.c,v 1.25 2006/06/20 18:24:04 todd Exp $ */
/*
@@ -13,7 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. The name of Genetec Corporation may not be used to endorse or
+ * 3. The name of Genetec Corporation may not be used to endorse or
* promote products derived from this software without specific prior
* written permission.
*
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * Machine dependent functions for kernel setup for
+ * Machine dependent functions for kernel setup for
* Intel DBPXA250 evaluation board (a.k.a. Lubbock).
* Based on iq80310_machhdep.c
*/
@@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.45 2019/11/13 17:59:56 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.46 2020/04/18 10:55:47 skrll Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
