diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2004-06-09 10:17:11 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2004-06-09 10:17:11 +0000 |
| commit | f375aa232da502bf7863198e041e8bafec8db3ac (patch) | |
| tree | 0fbb6c961a6e304d325dd6210117665a0163dc24 | |
| parent | a6be4391a73dd3a12d8e46fd42d8ac5e4fdfc962 (diff) | |
Minor sync from the SMP branch.
NVRAM_RESET_SOFT -> NVRAM_RESET_JUMP
ok deraadt@
| -rw-r--r-- | sys/arch/amd64/amd64/cpu.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/isa/nvram.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/amd64/cpu.c b/sys/arch/amd64/amd64/cpu.c index ee181c1938a..b0daa628924 100644 --- a/sys/arch/amd64/amd64/cpu.c +++ b/sys/arch/amd64/amd64/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.2 2004/02/23 08:32:36 mickey Exp $ */ +/* $OpenBSD: cpu.c,v 1.3 2004/06/09 10:17:10 art Exp $ */ /* $NetBSD: cpu.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $ */ /*- @@ -625,7 +625,7 @@ mp_cpu_start(struct cpu_info *ci) */ outb(IO_RTC, NVRAM_RESET); - outb(IO_RTC+1, NVRAM_RESET_SOFT); + outb(IO_RTC+1, NVRAM_RESET_JUMP); /* * "and the warm reset vector (DWORD based at 40:67) to point diff --git a/sys/arch/i386/isa/nvram.h b/sys/arch/i386/isa/nvram.h index ea74b71af75..60b037d0d09 100644 --- a/sys/arch/i386/isa/nvram.h +++ b/sys/arch/i386/isa/nvram.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nvram.h,v 1.6 2003/06/02 23:27:47 millert Exp $ */ +/* $OpenBSD: nvram.h,v 1.7 2004/06/09 10:17:10 art Exp $ */ /* $NetBSD: nvram.h,v 1.5 1995/05/05 22:08:43 mycroft Exp $ */ /*- @@ -50,7 +50,7 @@ #define NVRAM_RESET_RST 0x00 /* normal reset */ #define NVRAM_RESET_LOAD 0x04 /* load system */ -#define NVRAM_RESET_SOFT 0x0A /* soft reset */ +#define NVRAM_RESET_JUMP 0x0a /* jump through 40:67 */ /* NVRAM byte 2: diskette drive type in upper/lower nibble */ #define NVRAM_DISKETTE (MC_NVRAM_START + 2) /* RTC offset 0x10 */ |