Module Name: src
Committed By: skrll
Date: Sat Jun 20 07:01:16 UTC 2020
Modified Files:
src/sys/arch/arm/arm32: arm11_pmc.c arm32_reboot.c intr.c
kgdb_machdep.c kobj_machdep.c netbsd32_machdep.c
netbsd32_machdep_13.c netbsd32_machdep_16.c sys_machdep.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/arm32/arm11_pmc.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/arm32/arm32_reboot.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/arm/arm32/intr.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/arm32/kgdb_machdep.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/arm32/kobj_machdep.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/arm32/netbsd32_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/arm32/netbsd32_machdep_13.c \
src/sys/arch/arm/arm32/netbsd32_machdep_16.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/arm32/sys_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/arm11_pmc.c
diff -u src/sys/arch/arm/arm32/arm11_pmc.c:1.6 src/sys/arch/arm/arm32/arm11_pmc.c:1.7
--- src/sys/arch/arm/arm32/arm11_pmc.c:1.6 Sun Jan 27 02:08:37 2019
+++ src/sys/arch/arm/arm32/arm11_pmc.c Sat Jun 20 07:01:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arm11_pmc.c,v 1.6 2019/01/27 02:08:37 pgoyette Exp $ */
+/* $NetBSD: arm11_pmc.c,v 1.7 2020/06/20 07:01:16 skrll Exp $ */
/* Copyright (c) 2007 Microsoft
* All rights reserved.
@@ -34,11 +34,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm11_pmc.c,v 1.6 2019/01/27 02:08:37 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm11_pmc.c,v 1.7 2020/06/20 07:01:16 skrll Exp $");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/kernel.h>
+#include <sys/kernel.h>
#include <sys/time.h>
#include <sys/timetc.h>
#include <dev/clock_subr.h>
Index: src/sys/arch/arm/arm32/arm32_reboot.c
diff -u src/sys/arch/arm/arm32/arm32_reboot.c:1.11 src/sys/arch/arm/arm32/arm32_reboot.c:1.12
--- src/sys/arch/arm/arm32/arm32_reboot.c:1.11 Thu May 31 23:22:50 2018
+++ src/sys/arch/arm/arm32/arm32_reboot.c Sat Jun 20 07:01:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_reboot.c,v 1.11 2018/05/31 23:22:50 mrg Exp $ */
+/* $NetBSD: arm32_reboot.c,v 1.12 2020/06/20 07:01:16 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -122,7 +122,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_reboot.c,v 1.11 2018/05/31 23:22:50 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_reboot.c,v 1.12 2020/06/20 07:01:16 skrll Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -157,7 +157,7 @@ docpureset(int howto)
/* If there is no keyboard, cngetc() returns 0, so loop */
while (cngetc() == 0)
delay(100000);
- cnpollc(false);
+ cnpollc(false);
}
printf("rebooting...\r\n");
Index: src/sys/arch/arm/arm32/intr.c
diff -u src/sys/arch/arm/arm32/intr.c:1.34 src/sys/arch/arm/arm32/intr.c:1.35
--- src/sys/arch/arm/arm32/intr.c:1.34 Sat Sep 1 12:15:39 2012
+++ src/sys/arch/arm/arm32/intr.c Sat Jun 20 07:01:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.34 2012/09/01 12:15:39 matt Exp $ */
+/* $NetBSD: intr.c,v 1.35 2020/06/20 07:01:16 skrll Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.34 2012/09/01 12:15:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.35 2020/06/20 07:01:16 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.3
#include <uvm/uvm_extern.h>
#include <arm/arm32/machdep.h>
-
+
u_int spl_masks[NIPL];
extern u_int irqmasks[];
Index: src/sys/arch/arm/arm32/kgdb_machdep.c
diff -u src/sys/arch/arm/arm32/kgdb_machdep.c:1.7 src/sys/arch/arm/arm32/kgdb_machdep.c:1.8
--- src/sys/arch/arm/arm32/kgdb_machdep.c:1.7 Sun Oct 18 18:14:00 2009
+++ src/sys/arch/arm/arm32/kgdb_machdep.c Sat Jun 20 07:01:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kgdb_machdep.c,v 1.7 2009/10/18 18:14:00 snj Exp $ */
+/* $NetBSD: kgdb_machdep.c,v 1.8 2020/06/20 07:01:16 skrll Exp $ */
/*
* Copyright (c) 1996 Matthias Pfaller.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.7 2009/10/18 18:14:00 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.8 2020/06/20 07:01:16 skrll Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -66,7 +66,7 @@ kgdb_acc(vaddr_t va, size_t len)
* Translate a trap number into a unix compatible signal value.
* (gdb only understands unix signal numbers).
*/
-int
+int
kgdb_signal(int type)
{
@@ -136,7 +136,7 @@ kgdb_setregs(db_regs_t *regs, kgdb_reg_t
regs->tf_pc = gdb_regs[KGDB_REGNUM_R0 + 15];
regs->tf_spsr = gdb_regs[KGDB_REGNUM_SPSR];
-}
+}
/*
* Trap into kgdb to wait for debugger to connect,
Index: src/sys/arch/arm/arm32/kobj_machdep.c
diff -u src/sys/arch/arm/arm32/kobj_machdep.c:1.12 src/sys/arch/arm/arm32/kobj_machdep.c:1.13
--- src/sys/arch/arm/arm32/kobj_machdep.c:1.12 Fri Nov 3 09:59:08 2017
+++ src/sys/arch/arm/arm32/kobj_machdep.c Sat Jun 20 07:01:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kobj_machdep.c,v 1.12 2017/11/03 09:59:08 maxv Exp $ */
+/* $NetBSD: kobj_machdep.c,v 1.13 2020/06/20 07:01:16 skrll Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.12 2017/11/03 09:59:08 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.13 2020/06/20 07:01:16 skrll Exp $");
#define ELFSIZE ARCH_ELFSIZE
@@ -345,7 +345,7 @@ be8_ksym_swap(void *start, size_t size,
}
}
}
-
+
static void
kobj_be8_fixup(kobj_t ko)
{
Index: src/sys/arch/arm/arm32/netbsd32_machdep.c
diff -u src/sys/arch/arm/arm32/netbsd32_machdep.c:1.9 src/sys/arch/arm/arm32/netbsd32_machdep.c:1.10
--- src/sys/arch/arm/arm32/netbsd32_machdep.c:1.9 Wed Nov 13 16:11:27 2019
+++ src/sys/arch/arm/arm32/netbsd32_machdep.c Sat Jun 20 07:01:16 2020
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: netbsd32_machdep.c,v 1.9 2019/11/13 16:11:27 pgoyette Exp $");
+__KERNEL_RCSID(1, "$NetBSD: netbsd32_machdep.c,v 1.10 2020/06/20 07:01:16 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -101,21 +101,21 @@ netbsd32_vm_default_addr(struct proc *p,
{
if (topdown)
return VM_DEFAULT_ADDRESS_TOPDOWN(base, sz);
- else
+ else
return VM_DEFAULT_ADDRESS_BOTTOMUP(base, sz);
}
-void
+void
netbsd32_machdep_md_init(void)
-{
-
+{
+
/* nothing to do */
}
-
+
void
netbsd32_machdep_md_fini(void)
{
-
+
/* nothing to do */
}
Index: src/sys/arch/arm/arm32/netbsd32_machdep_13.c
diff -u src/sys/arch/arm/arm32/netbsd32_machdep_13.c:1.3 src/sys/arch/arm/arm32/netbsd32_machdep_13.c:1.4
--- src/sys/arch/arm/arm32/netbsd32_machdep_13.c:1.3 Wed Nov 13 16:11:27 2019
+++ src/sys/arch/arm/arm32/netbsd32_machdep_13.c Sat Jun 20 07:01:16 2020
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: netbsd32_machdep_13.c,v 1.3 2019/11/13 16:11:27 pgoyette Exp $");
+__KERNEL_RCSID(1, "$NetBSD: netbsd32_machdep_13.c,v 1.4 2020/06/20 07:01:16 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -64,20 +64,20 @@ compat_13_netbsd32_sigreturn(struct lwp
return compat_13_sys_sigreturn(l, &ua, retval);
}
-static struct syscall_package compat_arm32_netbsd32_13_syscalls[] = {
+static struct syscall_package compat_arm32_netbsd32_13_syscalls[] = {
{ NETBSD32_SYS_compat_13_sigreturn13, 0,
(sy_call_t *)compat_13_netbsd32_sigreturn },
{ 0, 0, NULL }
-};
-
+};
+
void
netbsd32_machdep_md_13_init(void)
{
-
+
(void)syscall_establish(&emul_netbsd32,
compat_arm32_netbsd32_13_syscalls);
}
-
+
void
netbsd32_machdep_md_13_fini(void)
{
Index: src/sys/arch/arm/arm32/netbsd32_machdep_16.c
diff -u src/sys/arch/arm/arm32/netbsd32_machdep_16.c:1.3 src/sys/arch/arm/arm32/netbsd32_machdep_16.c:1.4
--- src/sys/arch/arm/arm32/netbsd32_machdep_16.c:1.3 Wed Nov 13 16:11:27 2019
+++ src/sys/arch/arm/arm32/netbsd32_machdep_16.c Sat Jun 20 07:01:16 2020
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: netbsd32_machdep_16.c,v 1.3 2019/11/13 16:11:27 pgoyette Exp $");
+__KERNEL_RCSID(1, "$NetBSD: netbsd32_machdep_16.c,v 1.4 2020/06/20 07:01:16 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -74,11 +74,11 @@ static struct syscall_package compat_arm
void
netbsd32_machdep_md_16_init(void)
{
-
+
(void)syscall_establish(&emul_netbsd32,
compat_arm32_netbsd32_16_syscalls);
}
-
+
void
netbsd32_machdep_md_16_fini(void)
{
Index: src/sys/arch/arm/arm32/sys_machdep.c
diff -u src/sys/arch/arm/arm32/sys_machdep.c:1.23 src/sys/arch/arm/arm32/sys_machdep.c:1.24
--- src/sys/arch/arm/arm32/sys_machdep.c:1.23 Thu Mar 16 16:13:20 2017
+++ src/sys/arch/arm/arm32/sys_machdep.c Sat Jun 20 07:01:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_machdep.c,v 1.23 2017/03/16 16:13:20 chs Exp $ */
+/* $NetBSD: sys_machdep.c,v 1.24 2020/06/20 07:01:16 skrll Exp $ */
/*
* Copyright (c) 1995-1997 Mark Brinicombe.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.23 2017/03/16 16:13:20 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.24 2020/06/20 07:01:16 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -142,11 +142,11 @@ sys_sysarch(struct lwp *l, const struct
int error = 0;
switch(SCARG(uap, op)) {
- case ARM_SYNC_ICACHE :
+ case ARM_SYNC_ICACHE :
error = arm32_sync_icache(l, SCARG(uap, parms), retval);
break;
- case ARM_DRAIN_WRITEBUF :
+ case ARM_DRAIN_WRITEBUF :
error = arm32_drain_writebuf(l, SCARG(uap, parms), retval);
break;
@@ -164,7 +164,7 @@ sys_sysarch(struct lwp *l, const struct
}
return (error);
}
-
+
int
cpu_lwp_setprivate(lwp_t *l, void *addr)
{
