aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yang <weiyang@linux.vnet.ibm.com>2015-06-04 02:18:49 -0400
committerIngo Molnar <mingo@kernel.org>2015-06-05 07:53:22 -0400
commitf2af7d25b4aa5b01203cc76e7530ea7fd18864a0 (patch)
treed328003041ed0cd3e78f6e7bb84a8b91cd17aa9c
parentd4bd441532b81fe2be1706e7f9dbbe8b5a364bcf (diff)
x86/boot/setup: Clean up the e820_reserve_setup_data() code
Deobfuscate the 'found' logic, it can be replaced with a simple: if (!pa_data) return; and 'found' can be eliminated. Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Borislav Petkov <bp@alien8.de> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Yinghai Lu <yinghai@kernel.org> Link: http://lkml.kernel.org/r/1433398729-8314-1-git-send-email-weiyang@linux.vnet.ibm.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/kernel/setup.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index d74ac33290ae..c3992c3a4378 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -461,19 +461,18 @@ static void __init e820_reserve_setup_data(void)
461{ 461{
462 struct setup_data *data; 462 struct setup_data *data;
463 u64 pa_data; 463 u64 pa_data;
464 int found = 0;
465 464
466 pa_data = boot_params.hdr.setup_data; 465 pa_data = boot_params.hdr.setup_data;
466 if (!pa_data)
467 return;
468
467 while (pa_data) { 469 while (pa_data) {
468 data = early_memremap(pa_data, sizeof(*data)); 470 data = early_memremap(pa_data, sizeof(*data));
469 e820_update_range(pa_data, sizeof(*data)+data->len, 471 e820_update_range(pa_data, sizeof(*data)+data->len,
470 E820_RAM, E820_RESERVED_KERN); 472 E820_RAM, E820_RESERVED_KERN);
471 found = 1;
472 pa_data = data->next; 473 pa_data = data->next;
473 early_memunmap(data, sizeof(*data)); 474 early_memunmap(data, sizeof(*data));
474 } 475 }
475 if (!found)
476 return;
477 476
478 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); 477 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
479 memcpy(&e820_saved, &e820, sizeof(struct e820map)); 478 memcpy(&e820_saved, &e820, sizeof(struct e820map));