diff options
author | Mike Pechkin <mpech@cvs.openbsd.org> | 2001-09-20 17:02:33 +0000 |
---|---|---|
committer | Mike Pechkin <mpech@cvs.openbsd.org> | 2001-09-20 17:02:33 +0000 |
commit | 1090c37a2abb53f452afc18664a076f51e6f21b6 (patch) | |
tree | f584f4c3c851ada9b1836a869092f7a5f03c2514 /sys/arch/hp300 | |
parent | 6f37323ba7b6bb6a6b9ec40c4c94eb3706bb16a7 (diff) |
occured->occurred
idea from deraadt@ via NetBSD
millert@ ok
Diffstat (limited to 'sys/arch/hp300')
-rw-r--r-- | sys/arch/hp300/DOC/HPMMU.notes | 8 | ||||
-rw-r--r-- | sys/arch/hp300/dev/hd.c | 6 | ||||
-rw-r--r-- | sys/arch/hp300/hp300/machdep.c | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/sys/arch/hp300/DOC/HPMMU.notes b/sys/arch/hp300/DOC/HPMMU.notes index be817ab9784..3529aa490a4 100644 --- a/sys/arch/hp300/DOC/HPMMU.notes +++ b/sys/arch/hp300/DOC/HPMMU.notes @@ -1,4 +1,4 @@ -$OpenBSD: HPMMU.notes,v 1.2 1997/01/12 15:12:09 downsj Exp $ +$OpenBSD: HPMMU.notes,v 1.3 2001/09/20 17:02:29 mpech Exp $ $NetBSD: HPMMU.notes,v 1.2 1994/10/26 07:22:51 cgd Exp $ Overview: @@ -78,14 +78,14 @@ Hardware registers: TLB. More info below. 5F400C: MMU command/status register. Defined as follows: - bit 15: If 1, indicates a page table fault occured - bit 14: If 1, indicates a page fault occured + bit 15: If 1, indicates a page table fault occurred + bit 14: If 1, indicates a page fault occurred bit 13: If 1, indicates a protection fault (write to RO page) bit 6: MC68881 enable. Tied to chip enable line. (set this bit to enable) bit 5: MC68020 instruction cache enable. Tied to Insruction cache disable line. (set this bit to enable) - bit 3: If 1, indicates an MMU related bus error occured. + bit 3: If 1, indicates an MMU related bus error occurred. Bits 13-15 are now valid. bit 2: External cache enable. (set this bit to enable) bit 1: Supervisor mapping enable. Enables translation of diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c index e607f116233..42d3e7d2fbf 100644 --- a/sys/arch/hp300/dev/hd.c +++ b/sys/arch/hp300/dev/hd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hd.c,v 1.13 2001/08/26 00:15:36 miod Exp $ */ +/* $OpenBSD: hd.c,v 1.14 2001/09/20 17:02:30 mpech Exp $ */ /* $NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $ */ /* @@ -1027,7 +1027,7 @@ hderror(unit) return(1); /* - * First conjure up the block number at which the error occured. + * First conjure up the block number at which the error occurred. * Note that not all errors report a block number, in that case * we just use b_blkno. */ @@ -1045,7 +1045,7 @@ hderror(unit) * Now output a generic message suitable for badsect. * Note that we don't use harderr cuz it just prints * out b_blkno which is just the beginning block number - * of the transfer, not necessary where the error occured. + * of the transfer, not necessary where the error occurred. */ printf("%s%c: hard error sn%d\n", rs->sc_dev.dv_xname, 'a'+hdpart(bp->b_dev), pbn); diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c index 1ae24c7edcb..730beb099e8 100644 --- a/sys/arch/hp300/hp300/machdep.c +++ b/sys/arch/hp300/hp300/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.64 2001/09/19 20:50:56 mickey Exp $ */ +/* $OpenBSD: machdep.c,v 1.65 2001/09/20 17:02:30 mpech Exp $ */ /* $NetBSD: machdep.c,v 1.121 1999/03/26 23:41:29 mycroft Exp $ */ /* @@ -1193,7 +1193,7 @@ parityerrorfind() #endif /* * If looking is true we are searching for a known parity error - * and it has just occured. All we do is return to the higher + * and it has just occurred. All we do is return to the higher * level invocation. */ if (looking) @@ -1201,7 +1201,7 @@ parityerrorfind() s = splhigh(); /* * If setjmp returns true, the parity error we were searching - * for has just occured (longjmp above) at the current pg+o + * for has just occurred (longjmp above) at the current pg+o */ if (setjmp(&parcatch)) { printf("Parity error at 0x%x\n", ctob(pg)|o); @@ -1209,7 +1209,7 @@ parityerrorfind() goto done; } /* - * If we get here, a parity error has occured for the first time + * If we get here, a parity error has occurred for the first time * and we need to find it. We turn off any external caches and * loop thru memory, testing every longword til a fault occurs and * we regain control at setjmp above. Note that because of the |