diff options
| author | Wei Yang <weiyang@linux.vnet.ibm.com> | 2015-06-04 14:18:49 +0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-05 13:53:22 +0200 |
| commit | f2af7d25b4aa5b01203cc76e7530ea7fd18864a0 (patch) | |
| tree | d328003041ed0cd3e78f6e7bb84a8b91cd17aa9c /arch | |
| parent | d4bd441532b81fe2be1706e7f9dbbe8b5a364bcf (diff) | |
| download | linux-stable-f2af7d25b4aa5b01203cc76e7530ea7fd18864a0.tar.gz linux-stable-f2af7d25b4aa5b01203cc76e7530ea7fd18864a0.tar.bz2 linux-stable-f2af7d25b4aa5b01203cc76e7530ea7fd18864a0.zip | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/setup.c | 7 |
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) { struct setup_data *data; u64 pa_data; - int found = 0; pa_data = boot_params.hdr.setup_data; + if (!pa_data) + return; + while (pa_data) { data = early_memremap(pa_data, sizeof(*data)); e820_update_range(pa_data, sizeof(*data)+data->len, E820_RAM, E820_RESERVED_KERN); - found = 1; pa_data = data->next; early_memunmap(data, sizeof(*data)); } - if (!found) - return; sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); memcpy(&e820_saved, &e820, sizeof(struct e820map)); |