git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
x86_64
/
boot
/
setup.S
diff --git
a/arch/x86_64/boot/setup.S
b/arch/x86_64/boot/setup.S
index
12ea0b6
..
770940c
100644
(file)
--- a/
arch/x86_64/boot/setup.S
+++ b/
arch/x86_64/boot/setup.S
@@
-45,9
+45,8
@@
* Added long mode checking and SSE force. March 2003, Andi Kleen.
*/
* Added long mode checking and SSE force. March 2003, Andi Kleen.
*/
-#include <linux/config.h>
#include <asm/segment.h>
#include <asm/segment.h>
-#include <linux/
version
.h>
+#include <linux/
utsrelease
.h>
#include <linux/compile.h>
#include <asm/boot.h>
#include <asm/e820.h>
#include <linux/compile.h>
#include <asm/boot.h>
#include <asm/e820.h>
@@
-527,12
+526,12
@@
is_disk1:
movw %cs, %ax # aka SETUPSEG
subw $DELTA_INITSEG, %ax # aka INITSEG
movw %ax, %ds
movw %cs, %ax # aka SETUPSEG
subw $DELTA_INITSEG, %ax # aka INITSEG
movw %ax, %ds
- mov
w
$0, (0x1ff) # default is no pointing device
+ mov
b
$0, (0x1ff) # default is no pointing device
int $0x11 # int 0x11: equipment list
testb $0x04, %al # check if mouse installed
jz no_psmouse
int $0x11 # int 0x11: equipment list
testb $0x04, %al # check if mouse installed
jz no_psmouse
- mov
w
$0xAA, (0x1ff) # device present
+ mov
b
$0xAA, (0x1ff) # device present
no_psmouse:
#include "../../i386/boot/edd.S"
no_psmouse:
#include "../../i386/boot/edd.S"
@@
-837,13
+836,12
@@
gdt:
.word 0x9200 # data read/write
.word 0x00CF # granularity = 4096, 386
# (+5th nibble of limit)
.word 0x9200 # data read/write
.word 0x00CF # granularity = 4096, 386
# (+5th nibble of limit)
+gdt_end:
idt_48:
.word 0 # idt limit = 0
.word 0, 0 # idt base = 0L
gdt_48:
idt_48:
.word 0 # idt limit = 0
.word 0, 0 # idt base = 0L
gdt_48:
- .word 0x8000 # gdt limit=2048,
- # 256 GDT entries
-
+ .word gdt_end-gdt-1 # gdt limit
.word 0, 0 # gdt base (filled in later)
# Include video setup & detection code
.word 0, 0 # gdt base (filled in later)
# Include video setup & detection code