diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-07-01 23:04:10 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 07:16:22 -0400 |
commit | d9a81b4411d53196c4535c3a1258cb03d945c718 (patch) | |
tree | 75c914489220c5890b85e132fe78d5399d874612 /arch/x86 | |
parent | 4fcc545a7479135332f511a54611820c9f4208a0 (diff) |
x86: do not printout if we do not find setup_data
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/setup.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index b3469898717e..4ac01d0ce624 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -399,6 +399,7 @@ static void __init reserve_setup_data(void) | |||
399 | struct setup_data *data; | 399 | struct setup_data *data; |
400 | u64 pa_data; | 400 | u64 pa_data; |
401 | char buf[32]; | 401 | char buf[32]; |
402 | int found = 0; | ||
402 | 403 | ||
403 | if (boot_params.hdr.version < 0x0209) | 404 | if (boot_params.hdr.version < 0x0209) |
404 | return; | 405 | return; |
@@ -409,9 +410,13 @@ static void __init reserve_setup_data(void) | |||
409 | reserve_early(pa_data, pa_data+sizeof(*data)+data->len, buf); | 410 | reserve_early(pa_data, pa_data+sizeof(*data)+data->len, buf); |
410 | e820_update_range(pa_data, sizeof(*data)+data->len, | 411 | e820_update_range(pa_data, sizeof(*data)+data->len, |
411 | E820_RAM, E820_RESERVED_KERN); | 412 | E820_RAM, E820_RESERVED_KERN); |
413 | found = 1; | ||
412 | pa_data = data->next; | 414 | pa_data = data->next; |
413 | early_iounmap(data, sizeof(*data)); | 415 | early_iounmap(data, sizeof(*data)); |
414 | } | 416 | } |
417 | if (!found) | ||
418 | return; | ||
419 | |||
415 | sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); | 420 | sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); |
416 | printk(KERN_INFO "extended physical RAM map:\n"); | 421 | printk(KERN_INFO "extended physical RAM map:\n"); |
417 | e820_print_map("reserve setup_data"); | 422 | e820_print_map("reserve setup_data"); |