Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-drm-fsl-dcu.git] / arch / x86 / kernel / setup.c

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index d3b95b89e9b2974401b48b534bf71604d7db57cc..80f874bf999e3cfbb62eae13b8cf0d1b4a2c3c18 100644 (file)
--- 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));