summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjasper <jasper@openbsd.org>2016-09-19 17:59:18 +0000
committerjasper <jasper@openbsd.org>2016-09-19 17:59:18 +0000
commit480b6ecf9eaffc3cae59733bbddcc3463d66f398 (patch)
treeb8c7ff2ea2f6f8be1208b07af9db877ae447d124
parentSwitch softraid crypto from PKCS5 PBKDF2 to bcrypt PBKDF. (diff)
downloadwireguard-openbsd-480b6ecf9eaffc3cae59733bbddcc3463d66f398.tar.xz
wireguard-openbsd-480b6ecf9eaffc3cae59733bbddcc3463d66f398.zip
fix whitespace at EOL
-rw-r--r--sys/arch/alpha/alpha/db_trace.c4
-rw-r--r--sys/arch/arm/arm/db_trace.c24
-rw-r--r--sys/arch/mips64/mips64/db_machdep.c16
3 files changed, 22 insertions, 22 deletions
diff --git a/sys/arch/alpha/alpha/db_trace.c b/sys/arch/alpha/alpha/db_trace.c
index dcaf2fff473..b042b1a17ea 100644
--- a/sys/arch/alpha/alpha/db_trace.c
+++ b/sys/arch/alpha/alpha/db_trace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_trace.c,v 1.17 2016/04/27 11:03:24 mpi Exp $ */
+/* $OpenBSD: db_trace.c,v 1.18 2016/09/19 17:59:18 jasper Exp $ */
/*
* Copyright (c) 1997 Niklas Hallqvist. All rights reserved.
@@ -217,7 +217,7 @@ trapframe:
framesize = 0;
for (i = sizeof (int); i <= offset; i += sizeof (int)) {
inst = *(u_int *)(pc - i);
-
+
/*
* If by chance we don't have any symbols we have to
* get out somehow anyway. Check for the preceding
diff --git a/sys/arch/arm/arm/db_trace.c b/sys/arch/arm/arm/db_trace.c
index 67be84a0cf9..26c25449129 100644
--- a/sys/arch/arm/arm/db_trace.c
+++ b/sys/arch/arm/arm/db_trace.c
@@ -1,31 +1,31 @@
-/* $OpenBSD: db_trace.c,v 1.6 2016/04/20 07:59:25 mpi Exp $ */
+/* $OpenBSD: db_trace.c,v 1.7 2016/09/19 17:59:18 jasper Exp $ */
/* $NetBSD: db_trace.c,v 1.8 2003/01/17 22:28:48 thorpej Exp $ */
-/*
+/*
* Copyright (c) 2000, 2001 Ben Harris
* Copyright (c) 1996 Scott K. Stevens
*
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*/
@@ -52,7 +52,7 @@ db_regs_t ddb_regs;
* a structure to represent them is a good idea.
*
* Here's the diagram from the APCS. Increasing address is _up_ the page.
- *
+ *
* save code pointer [fp] <- fp points to here
* return link value [fp, #-4]
* return sp value [fp, #-8]
@@ -69,9 +69,9 @@ db_regs_t ddb_regs;
* [saved a2 value]
* [saved a1 value]
*
- * The save code pointer points twelve bytes beyond the start of the
- * code sequence (usually a single STM) that created the stack frame.
- * We have to disassemble it if we want to know which of the optional
+ * The save code pointer points twelve bytes beyond the start of the
+ * code sequence (usually a single STM) that created the stack frame.
+ * We have to disassemble it if we want to know which of the optional
* fields are actually present.
*/
@@ -112,7 +112,7 @@ db_stack_trace_print(addr, have_addr, count, modif, pr)
if (p == NULL) {
(*pr)("not found\n");
return;
- }
+ }
u = p->p_addr;
frame = (u_int32_t *)(u->u_pcb.pcb_un.un_32.pcb32_r11);
(*pr)("at %p\n", frame);
diff --git a/sys/arch/mips64/mips64/db_machdep.c b/sys/arch/mips64/mips64/db_machdep.c
index 3af59557c7d..41299aa5740 100644
--- a/sys/arch/mips64/mips64/db_machdep.c
+++ b/sys/arch/mips64/mips64/db_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_machdep.c,v 1.46 2016/08/14 08:23:52 visa Exp $ */
+/* $OpenBSD: db_machdep.c,v 1.47 2016/09/19 17:59:19 jasper Exp $ */
/*
* Copyright (c) 1998-2003 Opsycon AB (www.opsycon.se)
@@ -151,13 +151,13 @@ db_ktrap(int type, struct trapframe *fp)
}
printf("stopped on non ddb fault\n");
}
-
+
#ifdef MULTIPROCESSOR
mtx_enter(&ddb_mp_mutex);
if (ddb_state == DDB_STATE_EXITING)
ddb_state = DDB_STATE_NOT_RUNNING;
mtx_leave(&ddb_mp_mutex);
-
+
while (db_enter_ddb()) {
#endif
bcopy((void *)fp, (void *)&ddb_regs, NUMSAVEREGS * sizeof(register_t));
@@ -167,7 +167,7 @@ db_ktrap(int type, struct trapframe *fp)
db_trap(type, 0);
cnpollc(FALSE);
db_active--;
-
+
bcopy((void *)&ddb_regs, (void *)fp, NUMSAVEREGS * sizeof(register_t));
#ifdef MULTIPROCESSOR
if (!db_switch_cpu)
@@ -512,7 +512,7 @@ struct db_command mips_db_command_table[] = {
{ "startcpu", db_startproc_cmd, 0, NULL },
{ "stopcpu", db_stopproc_cmd, 0, NULL },
{ "ddbcpu", db_ddbproc_cmd, 0, NULL },
-#endif
+#endif
{ NULL, NULL, 0, NULL }
};
@@ -582,7 +582,7 @@ void
db_stopproc_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
{
int cpu_n;
-
+
if (have_addr) {
cpu_n = addr;
if (cpu_n >= 0 && cpu_n < ncpus &&
@@ -607,7 +607,7 @@ db_startcpu(int cpu)
get_cpu_info(cpu)->ci_ddb = CI_DDB_RUNNING;
mtx_leave(&ddb_mp_mutex);
}
-}
+}
void
db_stopcpu(int cpu)
@@ -615,7 +615,7 @@ db_stopcpu(int cpu)
mtx_enter(&ddb_mp_mutex);
if (cpu != cpu_number() && cpu < ncpus &&
get_cpu_info(cpu)->ci_ddb != CI_DDB_STOPPED) {
- get_cpu_info(cpu)->ci_ddb = CI_DDB_SHOULDSTOP;
+ get_cpu_info(cpu)->ci_ddb = CI_DDB_SHOULDSTOP;
mtx_leave(&ddb_mp_mutex);
mips64_send_ipi(cpu, MIPS64_IPI_DDB);
} else {