diff options
| author | Mike Larkin <mlarkin@cvs.openbsd.org> | 2024-11-18 02:32:23 +0000 |
|---|---|---|
| committer | Mike Larkin <mlarkin@cvs.openbsd.org> | 2024-11-18 02:32:23 +0000 |
| commit | 4845196ee4213b93076985cf8b281c63830f6a79 (patch) | |
| tree | 04977120bb6407d322d62a24369895f4d6b92806 | |
| parent | 41ee54c1c8089202c2f892c12832a0a6071f18cd (diff) | |
Fix some typos in comments in i386/amd64 bootblocks
Also fix some trailing whitespace in comments.
From Christian Schulte, thanks
| -rw-r--r-- | sys/arch/amd64/stand/libsa/memprobe.c | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/mbr/mbr.S | 8 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/memprobe.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/mbr/mbr.S | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/sys/arch/amd64/stand/libsa/memprobe.c b/sys/arch/amd64/stand/libsa/memprobe.c index 785b1d0e623..f4a5acf335b 100644 --- a/sys/arch/amd64/stand/libsa/memprobe.c +++ b/sys/arch/amd64/stand/libsa/memprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: memprobe.c,v 1.19 2021/01/28 18:54:52 deraadt Exp $ */ +/* $OpenBSD: memprobe.c,v 1.20 2024/11/18 02:32:22 mlarkin Exp $ */ /* * Copyright (c) 1997-1999 Michael Shalayeff @@ -100,7 +100,7 @@ bios_E820(bios_memmap_t *mp) /* * BIOS int 15, AX=8800 * - * Only used if int 15, AX=E801 does not work. + * Only used if int 15, AX=E820 does not work. * Machines with this are restricted to 64MB. */ static __inline bios_memmap_t * diff --git a/sys/arch/amd64/stand/mbr/mbr.S b/sys/arch/amd64/stand/mbr/mbr.S index 8d8c9f38c21..85af09393e4 100644 --- a/sys/arch/amd64/stand/mbr/mbr.S +++ b/sys/arch/amd64/stand/mbr/mbr.S @@ -1,4 +1,4 @@ -/* $OpenBSD: mbr.S,v 1.9 2022/09/02 07:46:03 krw Exp $ */ +/* $OpenBSD: mbr.S,v 1.10 2024/11/18 02:32:22 mlarkin Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff and Tobias Weingartner @@ -14,8 +14,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 @@ -99,7 +99,7 @@ start: /* * We don't need to disable and re-enable interrupts around the - * the load of ss and sp. + * load of ss and sp. * * From 80386 Programmer's Reference Manual: * "A MOV into SS inhibits all interrupts until after the execution diff --git a/sys/arch/i386/stand/libsa/memprobe.c b/sys/arch/i386/stand/libsa/memprobe.c index 07743d16eeb..77051b03b3e 100644 --- a/sys/arch/i386/stand/libsa/memprobe.c +++ b/sys/arch/i386/stand/libsa/memprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: memprobe.c,v 1.57 2016/06/10 18:36:06 jcs Exp $ */ +/* $OpenBSD: memprobe.c,v 1.58 2024/11/18 02:32:22 mlarkin Exp $ */ /* * Copyright (c) 1997-1999 Michael Shalayeff @@ -100,7 +100,7 @@ bios_E820(bios_memmap_t *mp) /* * BIOS int 15, AX=8800 * - * Only used if int 15, AX=E801 does not work. + * Only used if int 15, AX=E820 does not work. * Machines with this are restricted to 64MB. */ static __inline bios_memmap_t * diff --git a/sys/arch/i386/stand/mbr/mbr.S b/sys/arch/i386/stand/mbr/mbr.S index cc172b692f2..2b3587bdfbc 100644 --- a/sys/arch/i386/stand/mbr/mbr.S +++ b/sys/arch/i386/stand/mbr/mbr.S @@ -1,4 +1,4 @@ -/* $OpenBSD: mbr.S,v 1.27 2022/09/02 07:46:03 krw Exp $ */ +/* $OpenBSD: mbr.S,v 1.28 2024/11/18 02:32:22 mlarkin Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff and Tobias Weingartner @@ -14,8 +14,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 @@ -99,7 +99,7 @@ start: /* * We don't need to disable and re-enable interrupts around the - * the load of ss and sp. + * load of ss and sp. * * From 80386 Programmer's Reference Manual: * "A MOV into SS inhibits all interrupts until after the execution |