Commit f2af7d25 authored Jun 04, 2015 by Wei Yang Committed by Ingo Molnar Jun 05, 2015

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>

parent d4bd4415

arch/x86/kernel/setup.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -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));