summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2023-06-01 17:24:57 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2023-06-01 17:24:57 +0000
commit83c401a3d5f28243e7a8208f366626a8ba563924 (patch)
treee2ac2bac38693edb5271732f0db82dcc43846e1e /sys/arch
parentb2d8833118285ea2aadaf3bb919bb94641161542 (diff)
Expunge a bunch of eye searing trailing whitespace.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/sparc64/stand/ofwboot/Locore.c8
-rw-r--r--sys/arch/sparc64/stand/ofwboot/boot.c10
-rw-r--r--sys/arch/sparc64/stand/ofwboot/disk.h6
-rw-r--r--sys/arch/sparc64/stand/ofwboot/diskprobe.c6
-rw-r--r--sys/arch/sparc64/stand/ofwboot/elf64_exec.c8
-rw-r--r--sys/arch/sparc64/stand/ofwboot/md5.h8
-rw-r--r--sys/arch/sparc64/stand/ofwboot/net.c4
-rw-r--r--sys/arch/sparc64/stand/ofwboot/netif_of.c6
-rw-r--r--sys/arch/sparc64/stand/ofwboot/ofdev.c4
-rw-r--r--sys/arch/sparc64/stand/ofwboot/softraid_sparc64.c4
10 files changed, 32 insertions, 32 deletions
diff --git a/sys/arch/sparc64/stand/ofwboot/Locore.c b/sys/arch/sparc64/stand/ofwboot/Locore.c
index f8fcf5e0d94..89378a1197b 100644
--- a/sys/arch/sparc64/stand/ofwboot/Locore.c
+++ b/sys/arch/sparc64/stand/ofwboot/Locore.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: Locore.c,v 1.17 2022/10/17 18:55:20 kettenis Exp $ */
+/* $OpenBSD: Locore.c,v 1.18 2023/06/01 17:24:56 krw Exp $ */
/* $NetBSD: Locore.c,v 1.1 2000/08/20 14:58:36 mrg Exp $ */
/*
@@ -609,7 +609,7 @@ OF_child(int phandle)
cell_t phandle;
cell_t child;
} args;
-
+
args.name = ADR2CELL("child");
args.nargs = 1;
args.nreturns = 1;
@@ -629,7 +629,7 @@ OF_parent(int phandle)
cell_t phandle;
cell_t parent;
} args;
-
+
args.name = ADR2CELL("parent");
args.nargs = 1;
args.nreturns = 1;
@@ -651,7 +651,7 @@ OF_package_to_path(int phandle, char *buf, int buflen)
cell_t buflen;
cell_t length;
} args;
-
+
if (buflen > PAGE_SIZE)
return -1;
args.name = ADR2CELL("package-to-path");
diff --git a/sys/arch/sparc64/stand/ofwboot/boot.c b/sys/arch/sparc64/stand/ofwboot/boot.c
index 8e2524e338d..1e7869aa262 100644
--- a/sys/arch/sparc64/stand/ofwboot/boot.c
+++ b/sys/arch/sparc64/stand/ofwboot/boot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: boot.c,v 1.41 2023/04/13 02:19:05 jsg Exp $ */
+/* $OpenBSD: boot.c,v 1.42 2023/06/01 17:24:56 krw Exp $ */
/* $NetBSD: boot.c,v 1.3 2001/05/31 08:55:19 mrg Exp $ */
/*
* Copyright (c) 1997, 1999 Eduardo E. Horvath. All rights reserved.
@@ -191,7 +191,7 @@ chain(u_int64_t pentry, char *args, void *ssym, void *esym)
bcopy(&machine_tag, args + l, sizeof(machine_tag));
l += sizeof(machine_tag);
- /*
+ /*
* Since we don't need the boot string (we can get it from /chosen)
* we won't pass it in. Just pass in esym and magic #
*/
@@ -321,7 +321,7 @@ srbootdev(const char *bootline)
bootdev_dip = NULL;
- /*
+ /*
* Look for softraid disks in bootline.
* E.g. 'sr0', 'sr0:bsd', or 'sr0a:/bsd'
*/
@@ -422,7 +422,7 @@ main(void)
#endif
char **bootlp;
char *just_bootline[2];
-
+
printf(">> OpenBSD BOOT %s\n", version);
/*
@@ -483,7 +483,7 @@ main(void)
printf("bootargs too long: %s\n",
bootline);
_rtt();
- }
+ }
}
}
if (!bootlp) {
diff --git a/sys/arch/sparc64/stand/ofwboot/disk.h b/sys/arch/sparc64/stand/ofwboot/disk.h
index 2e4518596fa..56ccf49c3d9 100644
--- a/sys/arch/sparc64/stand/ofwboot/disk.h
+++ b/sys/arch/sparc64/stand/ofwboot/disk.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disk.h,v 1.3 2018/12/31 11:44:57 claudio Exp $ */
+/* $OpenBSD: disk.h,v 1.4 2023/06/01 17:24:56 krw Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -13,8 +13,8 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
diff --git a/sys/arch/sparc64/stand/ofwboot/diskprobe.c b/sys/arch/sparc64/stand/ofwboot/diskprobe.c
index e4933b850ce..9fa8d3ea895 100644
--- a/sys/arch/sparc64/stand/ofwboot/diskprobe.c
+++ b/sys/arch/sparc64/stand/ofwboot/diskprobe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diskprobe.c,v 1.6 2018/12/31 11:44:57 claudio Exp $ */
+/* $OpenBSD: diskprobe.c,v 1.7 2023/06/01 17:24:56 krw Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis <kettenis@openbsd.org>
@@ -48,7 +48,7 @@ new_diskinfo(int node)
bzero(dip, sizeof(*dip));
len = OF_package_to_path(node, dip->path, sizeof(dip->path));
- if (len < 0) {
+ if (len < 0) {
DPRINTF("could not get path for disk node %x\n", node);
goto bad;
} else if (len >= sizeof(dip->path)) {
@@ -138,7 +138,7 @@ diskprobe(void)
if (node == 0 || node == -1) {
if (--depth < 0)
return;
-
+
stack[depth] = OF_peer(stack[depth]);
continue;
}
diff --git a/sys/arch/sparc64/stand/ofwboot/elf64_exec.c b/sys/arch/sparc64/stand/ofwboot/elf64_exec.c
index 8c13615715f..911f8018c55 100644
--- a/sys/arch/sparc64/stand/ofwboot/elf64_exec.c
+++ b/sys/arch/sparc64/stand/ofwboot/elf64_exec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: elf64_exec.c,v 1.13 2023/04/13 02:19:05 jsg Exp $ */
+/* $OpenBSD: elf64_exec.c,v 1.14 2023/06/01 17:24:56 krw Exp $ */
/* $NetBSD: elfXX_exec.c,v 1.2 2001/08/15 20:08:15 eeh Exp $ */
/*
@@ -75,7 +75,7 @@ extern int boothowto;
void syncicache(void *, int);
int
-elf64_exec(int fd, Elf_Ehdr *elf, u_int64_t *entryp, void **ssymp, void **esymp){
+elf64_exec(int fd, Elf_Ehdr *elf, u_int64_t *entryp, void **ssymp, void **esymp){
Elf_Shdr *shp;
Elf_Off off;
void *addr;
@@ -118,7 +118,7 @@ elf64_exec(int fd, Elf_Ehdr *elf, u_int64_t *entryp, void **ssymp, void **esymp)
obd->len = BOOTDATA_LEN_SOFTRAID;
#ifdef SOFTRAID
- /*
+ /*
* If booting from softraid we must pass additional
* information to the kernel:
* 1) The uuid of the softraid volume we booted from.
@@ -158,7 +158,7 @@ elf64_exec(int fd, Elf_Ehdr *elf, u_int64_t *entryp, void **ssymp, void **esymp)
(u_long)phdr.p_vaddr);
(void)lseek(fd, (size_t)phdr.p_offset, SEEK_SET);
- /*
+ /*
* If the segment's VA is aligned on a 4MB boundary, align its
* request 4MB aligned physical memory. Otherwise use default
* alignment. Make sure BSS is extended to a 4MB boundary, too.
diff --git a/sys/arch/sparc64/stand/ofwboot/md5.h b/sys/arch/sparc64/stand/ofwboot/md5.h
index 216e28046ed..1a8c8f08182 100644
--- a/sys/arch/sparc64/stand/ofwboot/md5.h
+++ b/sys/arch/sparc64/stand/ofwboot/md5.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: md5.h,v 1.3 2002/03/14 01:26:46 millert Exp $ */
+/* $OpenBSD: md5.h,v 1.4 2023/06/01 17:24:56 krw Exp $ */
/* $NetBSD: md5.h,v 1.1 2000/08/20 14:58:38 mrg Exp $ */
/*
@@ -15,17 +15,17 @@
* is identified as the "RSA Data Security, Inc. MD5 Message-Digest
* Algorithm" in all material mentioning or referencing this software
* or this function.
- *
+ *
* License is also granted to make and use derivative works provided
* that such works are identified as "derived from the RSA Data
* Security, Inc. MD5 Message-Digest Algorithm" in all material
* mentioning or referencing the derived work.
- *
+ *
* RSA Data Security, Inc. makes no representations concerning either
* the merchantability of this software or the suitability of this
* software for any particular purpose. It is provided "as is"
* without express or implied warranty of any kind.
- *
+ *
* These notices must be retained in any copies of any part of this
* documentation and/or software.
*/
diff --git a/sys/arch/sparc64/stand/ofwboot/net.c b/sys/arch/sparc64/stand/ofwboot/net.c
index 6e686128f44..be57909d066 100644
--- a/sys/arch/sparc64/stand/ofwboot/net.c
+++ b/sys/arch/sparc64/stand/ofwboot/net.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: net.c,v 1.8 2021/01/30 21:06:45 deraadt Exp $ */
+/* $OpenBSD: net.c,v 1.9 2023/06/01 17:24:56 krw Exp $ */
/* $NetBSD: net.c,v 1.1 2000/08/20 14:58:38 mrg Exp $ */
/*
@@ -83,7 +83,7 @@ int
net_open(struct of_dev *op)
{
int error = 0;
-
+
/*
* On first open, do netif open, mount, etc.
*/
diff --git a/sys/arch/sparc64/stand/ofwboot/netif_of.c b/sys/arch/sparc64/stand/ofwboot/netif_of.c
index ea1d63db5b9..220f59e13f6 100644
--- a/sys/arch/sparc64/stand/ofwboot/netif_of.c
+++ b/sys/arch/sparc64/stand/ofwboot/netif_of.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netif_of.c,v 1.7 2014/08/21 14:24:08 mpi Exp $ */
+/* $OpenBSD: netif_of.c,v 1.8 2023/06/01 17:24:56 krw Exp $ */
/* $NetBSD: netif_of.c,v 1.1 2000/08/20 14:58:39 mrg Exp $ */
/*
@@ -74,7 +74,7 @@ netif_open(void *machdep_hint)
struct iodesc *io;
int fd, error;
char addr[32];
-
+
DNPRINTF(BOOT_D_OFNET, "netif_open...");
/* find a free socket */
@@ -88,7 +88,7 @@ netif_open(void *machdep_hint)
netif_of.nif_devdata = op;
io->io_netif = &netif_of;
-
+
/* Put our ethernet address in io->myea */
OF_getprop(OF_instance_to_package(op->handle),
"mac-address", io->myea, sizeof io->myea);
diff --git a/sys/arch/sparc64/stand/ofwboot/ofdev.c b/sys/arch/sparc64/stand/ofwboot/ofdev.c
index d35ee90c685..2310867a139 100644
--- a/sys/arch/sparc64/stand/ofwboot/ofdev.c
+++ b/sys/arch/sparc64/stand/ofwboot/ofdev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ofdev.c,v 1.37 2023/05/31 13:49:56 krw Exp $ */
+/* $OpenBSD: ofdev.c,v 1.38 2023/06/01 17:24:56 krw Exp $ */
/* $NetBSD: ofdev.c,v 1.1 2000/08/20 14:58:41 mrg Exp $ */
/*
@@ -683,7 +683,7 @@ devopen(struct open_file *of, const char *name, char **file)
parent = OF_parent(dhandle);
if (parent && OF_getprop(parent, "device_type", buf,
sizeof(buf)) > 0 && strcmp(buf, "ide") == 0) {
- DNPRINTF(BOOT_D_OFDEV,
+ DNPRINTF(BOOT_D_OFDEV,
"devopen: Disable writing for IDE block device\n");
of->f_flags |= F_NOWRITE;
}
diff --git a/sys/arch/sparc64/stand/ofwboot/softraid_sparc64.c b/sys/arch/sparc64/stand/ofwboot/softraid_sparc64.c
index 6d90419387b..bd0b5e59510 100644
--- a/sys/arch/sparc64/stand/ofwboot/softraid_sparc64.c
+++ b/sys/arch/sparc64/stand/ofwboot/softraid_sparc64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_sparc64.c,v 1.6 2022/09/02 08:13:03 kn Exp $ */
+/* $OpenBSD: softraid_sparc64.c,v 1.7 2023/06/01 17:24:56 krw Exp $ */
/*
* Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
@@ -49,7 +49,7 @@ srprobe_meta_opt_load(struct sr_metadata *sm, struct sr_meta_opt_head *som)
for (i = 0; i < sm->ssdi.ssd_opt_no; i++) {
#ifdef DEBUG
- printf("Found optional metadata of type %u, length %u\n",
+ printf("Found optional metadata of type %u, length %u\n",
omh->som_type, omh->som_length);
#endif