diff options
| author | bde <bde@FreeBSD.org> | 1996-04-26 22:26:45 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1996-04-26 22:26:45 +0000 |
| commit | 42379df49e21af1bc7bc2e7f64e8a159e746f92b (patch) | |
| tree | 41ed4e886bdfd5b620f19083b2bd1af164fdffcc /sys/amd64 | |
| parent | 651af4a301f28f59b7174fc381c01258bdbeebff (diff) | |
| download | FreeBSD-src-42379df49e21af1bc7bc2e7f64e8a159e746f92b.zip FreeBSD-src-42379df49e21af1bc7bc2e7f64e8a159e746f92b.tar.gz | |
Fixed a bug introoduced in the previous change. ISA device memory was
mapped to semi-random place(s) depending on the content(s) of physical
address 0xA0000. This was fatal at least on my system with a some
memory-mapped devices. Console syscons somehow wasn't affected. It
bogusly hardcodes the address. Sigh.
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/locore.S | 6 | ||||
| -rw-r--r-- | sys/amd64/amd64/locore.s | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index 723ea02..0b7a789 100644 --- a/sys/amd64/amd64/locore.S +++ b/sys/amd64/amd64/locore.S @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $Id: locore.s,v 1.64 1996/03/27 17:16:29 bde Exp $ + * $Id: locore.s,v 1.65 1996/04/26 13:47:37 phk Exp $ * * originally from: locore.s, by William F. Jolitz * @@ -725,13 +725,13 @@ create_pagetables: #define ISA_HOLE_START 0xa0000 #define ISA_HOLE_LENGTH (0x100000-ISA_HOLE_START) movl $ISA_HOLE_LENGTH>>PGSHIFT, %ecx - movl ISA_HOLE_START, %eax + movl $ISA_HOLE_START, %eax movl %eax, %ebx shrl $PGSHIFT-2, %ebx addl R(_KPTphys), %ebx orl $PG_V|PG_KW|PG_N, %eax fillkpt - movl ISA_HOLE_START, %eax + movl $ISA_HOLE_START, %eax addl $KERNBASE, %eax movl %eax, R(_atdevbase) diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s index 723ea02..0b7a789 100644 --- a/sys/amd64/amd64/locore.s +++ b/sys/amd64/amd64/locore.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $Id: locore.s,v 1.64 1996/03/27 17:16:29 bde Exp $ + * $Id: locore.s,v 1.65 1996/04/26 13:47:37 phk Exp $ * * originally from: locore.s, by William F. Jolitz * @@ -725,13 +725,13 @@ create_pagetables: #define ISA_HOLE_START 0xa0000 #define ISA_HOLE_LENGTH (0x100000-ISA_HOLE_START) movl $ISA_HOLE_LENGTH>>PGSHIFT, %ecx - movl ISA_HOLE_START, %eax + movl $ISA_HOLE_START, %eax movl %eax, %ebx shrl $PGSHIFT-2, %ebx addl R(_KPTphys), %ebx orl $PG_V|PG_KW|PG_N, %eax fillkpt - movl ISA_HOLE_START, %eax + movl $ISA_HOLE_START, %eax addl $KERNBASE, %eax movl %eax, R(_atdevbase) |
