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
vserver 2.0 rc7
[linux-2.6.git]
/
arch
/
i386
/
boot
/
setup.S
diff --git
a/arch/i386/boot/setup.S
b/arch/i386/boot/setup.S
index
5623e82
..
caa1fde
100644
(file)
--- a/
arch/i386/boot/setup.S
+++ b/
arch/i386/boot/setup.S
@@
-162,7
+162,9
@@
ramdisk_max: .long (-__PAGE_OFFSET-(512 << 20)-1) & 0x7fffffff
# the contents of an initrd
trampoline: call start_of_setup
# the contents of an initrd
trampoline: call start_of_setup
- .space 1024
+ .align 16
+ # The offset at this point is 0x240
+ .space (0xeff-0x240+1) # E820 & EDD space (ending at 0xeff)
# End of setup header #####################################################
start_of_setup:
# End of setup header #####################################################
start_of_setup:
@@
-331,9
+333,9
@@
jmpe820:
# sizeof(e820rec).
#
good820:
# sizeof(e820rec).
#
good820:
- movb (E820NR), %al # up to
32
entries
+ movb (E820NR), %al # up to
128
entries
cmpb $E820MAX, %al
cmpb $E820MAX, %al
- j
nl
bail820
+ j
ae
bail820
incb (E820NR)
movw %di, %ax
incb (E820NR)
movw %di, %ax