diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-15 14:06:48 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 14:06:48 -0700 |
| commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
| tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /arch/x86_64/boot/bootsect.S | |
| parent | 325a479c4c110db278ef3361460a48c4093252cc (diff) | |
| parent | 1016888fb69662936b32ab767c7419a3be9a69d3 (diff) | |
| download | kernel-crypto-f2cbb4f01936a3e4225692e03b084b78c56d386d.tar.gz kernel-crypto-f2cbb4f01936a3e4225692e03b084b78c56d386d.tar.xz kernel-crypto-f2cbb4f01936a3e4225692e03b084b78c56d386d.zip | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/x86_64/boot/bootsect.S')
| -rw-r--r-- | arch/x86_64/boot/bootsect.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/boot/bootsect.S b/arch/x86_64/boot/bootsect.S index bb15d406ee9..011b7a4993d 100644 --- a/arch/x86_64/boot/bootsect.S +++ b/arch/x86_64/boot/bootsect.S @@ -63,7 +63,7 @@ msg_loop: jz die movb $0xe, %ah movw $7, %bx - int $0x10 + int $0x10 jmp msg_loop die: @@ -71,7 +71,7 @@ die: xorw %ax, %ax int $0x16 int $0x19 - + # int 0x19 should never return. In case it does anyway, # invoke the BIOS reset code... ljmp $0xf000,$0xfff0 |