diff options
author | Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> | 2005-05-01 11:58:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-01 11:58:51 -0400 |
commit | f9ba70535dc12d9eb57d466a2ecd749e16eca866 (patch) | |
tree | 7032500f7697e37e8e93869bdcefd4ab5473a136 /arch/i386 | |
parent | be9e68703c53fece406bc2e40976a5cfe2a8e77f (diff) |
[PATCH] Increase number of e820 entries hard limit from 32 to 128
The specifications that talk about E820 map doesn't have an upper limit on
the number of e820 entries. But, today's kernel has a hard limit of 32.
With increase in memory size, we are seeing the number of E820 entries
reaching close to 32. Patch below bumps the number upto 128.
The patch changes the location of EDDBUF in zero-page (as it comes after E820).
As, EDDBUF is not used by boot loaders, this patch should not have any effect
on bootloader-setup code interface.
Patch covers both i386 and x86-64.
Tested on:
* grub booting bzImage
* lilo booting bzImage with EDID info enabled
* pxeboot of bzImage
Side-effect:
bss increases by ~ 2K and init.data increases by ~7.5K
on all systems, due to increase in size of static arrays.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386')
-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 a934ab32bf8e..caa1fde6904e 100644 --- a/arch/i386/boot/setup.S +++ b/arch/i386/boot/setup.S | |||
@@ -164,7 +164,7 @@ ramdisk_max: .long (-__PAGE_OFFSET-(512 << 20)-1) & 0x7fffffff | |||
164 | trampoline: call start_of_setup | 164 | trampoline: call start_of_setup |
165 | .align 16 | 165 | .align 16 |
166 | # The offset at this point is 0x240 | 166 | # The offset at this point is 0x240 |
167 | .space (0x7ff-0x240+1) # E820 & EDD space (ending at 0x7ff) | 167 | .space (0xeff-0x240+1) # E820 & EDD space (ending at 0xeff) |
168 | # End of setup header ##################################################### | 168 | # End of setup header ##################################################### |
169 | 169 | ||
170 | start_of_setup: | 170 | start_of_setup: |
@@ -333,9 +333,9 @@ jmpe820: | |||
333 | # sizeof(e820rec). | 333 | # sizeof(e820rec). |
334 | # | 334 | # |
335 | good820: | 335 | good820: |
336 | movb (E820NR), %al # up to 32 entries | 336 | movb (E820NR), %al # up to 128 entries |
337 | cmpb $E820MAX, %al | 337 | cmpb $E820MAX, %al |
338 | jnl bail820 | 338 | jae bail820 |
339 | 339 | ||
340 | incb (E820NR) | 340 | incb (E820NR) |
341 | movw %di, %ax | 341 | movw %di, %ax |