aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mach-default
diff options
context:
space:
mode:
authorPaul Jackson <pj@sgi.com>2008-05-14 08:15:46 -0700
committerThomas Gleixner <tglx@linutronix.de>2008-05-25 10:55:11 +0200
commit6e9bcc796b120d17b08dde7ab958b82ddb899889 (patch)
treee7cecb5a49f875beae9b6aff6bb44777be714430 /arch/x86/mach-default
parent028b785888c523baccdf27af0cdbf1deb92edec0 (diff)
downloadkernel_samsung_smdk4412-6e9bcc796b120d17b08dde7ab958b82ddb899889.zip
kernel_samsung_smdk4412-6e9bcc796b120d17b08dde7ab958b82ddb899889.tar.gz
kernel_samsung_smdk4412-6e9bcc796b120d17b08dde7ab958b82ddb899889.tar.bz2
x86 boot: change sanitize_e820_map parameter from byte to int to allow bigger memory maps
The map size counter passed into, and back out of, sanitize_e820_map(), was an eight bit type (char or u8), as derived from its origins in legacy BIOS E820 structures. This patch changes that type to an 'int', to allow this sanitize routine to also be used on larger maps (larger than the 256 count that fits in a char). The legacy BIOS E820 interface of course does not change; that remains at 8 bits for this count, holding up to E820MAX == 128 entries. But the kernel internals can handle more when those additional memory map entries are passed from the BIOS via EFI interfaces. Signed-off-by: Paul Jackson <pj@sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mach-default')
-rw-r--r--arch/x86/mach-default/setup.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/mach-default/setup.c b/arch/x86/mach-default/setup.c
index 38a856c..56b4c39 100644
--- a/arch/x86/mach-default/setup.c
+++ b/arch/x86/mach-default/setup.c
@@ -153,6 +153,7 @@ late_initcall(print_ipi_mode);
char * __init machine_specific_memory_setup(void)
{
char *who;
+ int new_nr;
who = "BIOS-e820";
@@ -163,9 +164,11 @@ char * __init machine_specific_memory_setup(void)
* Otherwise fake a memory map; one section from 0k->640k,
* the next section from 1mb->appropriate_mem_k
*/
+ new_nr = boot_params.e820_entries;
sanitize_e820_map(boot_params.e820_map,
ARRAY_SIZE(boot_params.e820_map),
- &boot_params.e820_entries);
+ &new_nr);
+ boot_params.e820_entries = new_nr;
if (copy_e820_map(boot_params.e820_map, boot_params.e820_entries)
< 0) {
unsigned long mem_size;