diff options
| author | bde <bde@FreeBSD.org> | 1997-11-20 19:41:20 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1997-11-20 19:41:20 +0000 |
| commit | 2ba2c6e5da88344da3a9ef259307688aacbee71e (patch) | |
| tree | 7dceb136c85c81eb4b9888f6359e690dfea628be /sys | |
| parent | d1b702788e21989b72869bd03bb9a27bfcba04a5 (diff) | |
| download | FreeBSD-src-2ba2c6e5da88344da3a9ef259307688aacbee71e.zip FreeBSD-src-2ba2c6e5da88344da3a9ef259307688aacbee71e.tar.gz | |
Removed a duplicate (sloppy common-style) definition.
Fixed some style bugs.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/amd64/vm_machdep.c | 9 | ||||
| -rw-r--r-- | sys/i386/i386/vm_machdep.c | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index e18e2a5..91a5b15 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $Id: vm_machdep.c,v 1.90 1997/10/10 09:44:12 peter Exp $ + * $Id: vm_machdep.c,v 1.91 1997/11/18 09:27:23 bde Exp $ */ #include "npx.h" @@ -89,7 +89,6 @@ static void vm_bounce_page_free __P((vm_offset_t pa, int count)); static volatile int kvasfreecnt; caddr_t bouncememory; -int bouncepages; static int bpwait; static vm_offset_t *bouncepa; static int bmwait, bmfreeing; @@ -815,12 +814,14 @@ vunmapbuf(bp) * Force reset the processor by invalidating the entire address space! */ void -cpu_reset() { +cpu_reset() +{ + #ifdef PC98 /* * Attempt to do a CPU reset via CPU reset port. */ - asm("cli"); + disable_intr(); outb(0x37, 0x0f); /* SHUT0 = 0. */ outb(0x37, 0x0b); /* SHUT1 = 0. */ outb(0xf0, 0x00); /* Reset. */ diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index e18e2a5..91a5b15 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $Id: vm_machdep.c,v 1.90 1997/10/10 09:44:12 peter Exp $ + * $Id: vm_machdep.c,v 1.91 1997/11/18 09:27:23 bde Exp $ */ #include "npx.h" @@ -89,7 +89,6 @@ static void vm_bounce_page_free __P((vm_offset_t pa, int count)); static volatile int kvasfreecnt; caddr_t bouncememory; -int bouncepages; static int bpwait; static vm_offset_t *bouncepa; static int bmwait, bmfreeing; @@ -815,12 +814,14 @@ vunmapbuf(bp) * Force reset the processor by invalidating the entire address space! */ void -cpu_reset() { +cpu_reset() +{ + #ifdef PC98 /* * Attempt to do a CPU reset via CPU reset port. */ - asm("cli"); + disable_intr(); outb(0x37, 0x0f); /* SHUT0 = 0. */ outb(0x37, 0x0b); /* SHUT1 = 0. */ outb(0xf0, 0x00); /* Reset. */ |
