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

[linux-2.6-block.git] / arch / x86 / kernel / setup.c

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 1708862fc40dd0fde25ff5f47057cf67db8d8091..06853e6703541f8349106e17330f86621fa984db 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -295,6 +295,8 @@ static void __init reserve_brk(void)
        _brk_start = 0;
 }
 
+u64 relocated_ramdisk;
+
 #ifdef CONFIG_BLK_DEV_INITRD
 
 static u64 __init get_ramdisk_image(void)
@@ -321,25 +323,24 @@ static void __init relocate_initrd(void)
        u64 ramdisk_image = get_ramdisk_image();
        u64 ramdisk_size  = get_ramdisk_size();
        u64 area_size     = PAGE_ALIGN(ramdisk_size);
-       u64 ramdisk_here;
        unsigned long slop, clen, mapaddr;
        char *p, *q;
 
        /* We need to move the initrd down into directly mapped mem */
-       ramdisk_here = memblock_find_in_range(0, PFN_PHYS(max_pfn_mapped),
-                                                area_size, PAGE_SIZE);
+       relocated_ramdisk = memblock_find_in_range(0, PFN_PHYS(max_pfn_mapped),
+                                                  area_size, PAGE_SIZE);
 
-       if (!ramdisk_here)
+       if (!relocated_ramdisk)
                panic("Cannot find place for new RAMDISK of size %lld\n",
-                        ramdisk_size);
+                     ramdisk_size);
 
        /* Note: this includes all the mem currently occupied by
           the initrd, we rely on that fact to keep the data intact. */
-       memblock_reserve(ramdisk_here, area_size);
-       initrd_start = ramdisk_here + PAGE_OFFSET;
+       memblock_reserve(relocated_ramdisk, area_size);
+       initrd_start = relocated_ramdisk + PAGE_OFFSET;
        initrd_end   = initrd_start + ramdisk_size;
        printk(KERN_INFO "Allocated new RAMDISK: [mem %#010llx-%#010llx]\n",
-                        ramdisk_here, ramdisk_here + ramdisk_size - 1);
+              relocated_ramdisk, relocated_ramdisk + ramdisk_size - 1);
 
        q = (char *)initrd_start;
 
@@ -363,7 +364,7 @@ static void __init relocate_initrd(void)
        printk(KERN_INFO "Move RAMDISK from [mem %#010llx-%#010llx] to"
                " [mem %#010llx-%#010llx]\n",
                ramdisk_image, ramdisk_image + ramdisk_size - 1,
-               ramdisk_here, ramdisk_here + ramdisk_size - 1);
+               relocated_ramdisk, relocated_ramdisk + ramdisk_size - 1);
 }
 
 static void __init early_reserve_initrd(void)
@@ -447,6 +448,9 @@ static void __init parse_setup_data(void)
                case SETUP_DTB:
                        add_dtb(pa_data);
                        break;
+               case SETUP_EFI:
+                       parse_efi_setup(pa_data, data_len);
+                       break;
                default:
                        break;
                }
@@ -938,8 +942,6 @@ void __init setup_arch(char **cmdline_p)
        iomem_resource.end = (1ULL << boot_cpu_data.x86_phys_bits) - 1;
        setup_memory_map();
        parse_setup_data();
-       /* update the e820_saved too */
-       e820_reserve_setup_data();
 
        copy_edd();
 
@@ -1001,12 +1003,15 @@ void __init setup_arch(char **cmdline_p)
                early_dump_pci_devices();
 #endif
 
+       /* update the e820_saved too */
+       e820_reserve_setup_data();
        finish_e820_parsing();
 
        if (efi_enabled(EFI_BOOT))
                efi_init();
 
        dmi_scan_machine();
+       dmi_memdev_walk();
        dmi_set_dump_stack_arch_desc();
 
        /*
@@ -1134,8 +1139,6 @@ void __init setup_arch(char **cmdline_p)
        acpi_initrd_override((void *)initrd_start, initrd_end - initrd_start);
 #endif
 
-       reserve_crashkernel();
-
        vsmp_init();
 
        io_delay_init();
@@ -1148,6 +1151,13 @@ void __init setup_arch(char **cmdline_p)
        early_acpi_boot_init();
 
        initmem_init();
+
+       /*
+        * Reserve memory for crash kernel after SRAT is parsed so that it
+        * won't consume hotpluggable memory.
+        */
+       reserve_crashkernel();
+
        memblock_find_dma_reserve();
 
 #ifdef CONFIG_KVM_GUEST