diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-21 22:34:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-21 22:34:01 +0000 |
| commit | 9e30c3705aed9fbec4c3304570e4d6e707856bcb (patch) | |
| tree | b19e6acb5a67af31a4e7742e05c2166dc3f1444c /arch/i386/boot/setup.S | |
| parent | 72919904796333a20c6a5d5c380091b42e407aa9 (diff) | |
Merge with Linux 2.3.22.
Diffstat (limited to 'arch/i386/boot/setup.S')
| -rw-r--r-- | arch/i386/boot/setup.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/boot/setup.S b/arch/i386/boot/setup.S index 1a6d6baa8..859c7248b 100644 --- a/arch/i386/boot/setup.S +++ b/arch/i386/boot/setup.S @@ -145,7 +145,7 @@ start_of_setup: #ifdef SAFE_RESET_DISK_CONTROLLER # Reset the disk controller. movw $0x0000, %ax - movb $0x80, $dl + movb $0x80, %dl int $0x13 #endif @@ -400,7 +400,7 @@ is_disk1: subw $DELTA_INITSEG, %ax # aka INITSEG movw %ax, %ds xorw %ax, %ax - movw %ax, 0xa0 # set table length to 0 + movw %ax, (0xa0) # set table length to 0 movb $0xc0, %ah stc int $0x15 # moves feature table to es:bx @@ -496,7 +496,7 @@ done_apm_bios: cmpw $0, %cs:realmode_swtch jz rmodeswtch_normal - call *%cs:realmode_swtch + lcall %cs:realmode_swtch jmp rmodeswtch_end |