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

Pull x86 fixes from Ingo Molnar:
 "Two FPU rewrite related fixes.  This addresses all known x86
  regressions at this stage.  Also some other misc fixes"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/fpu: Fix boot crash in the early FPU code
  x86/asm/entry/64: Update path names
  x86/fpu: Fix FPU related boot regression when CPUID masking BIOS feature is enabled
  x86/boot/setup: Clean up the e820_reserve_setup_data() code
  x86/kaslr: Fix typo in the KASLR_FLAG documentation

diff --combined arch/x86/kernel/setup.c
index d3b95b89e9b2974401b48b534bf71604d7db57cc,4883c0a990a57bbef076afa63f1ff75694d7f98d..80f874bf999e3cfbb62eae13b8cf0d1b4a2c3c18
--- 1/arch/x86/kernel/setup.c
--- 2/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@@ -461,19 -461,18 +461,18 @@@ static void __init e820_reserve_setup_d
  {
        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));
@@@ -836,7 -835,7 +835,7 @@@ dump_kernel_offset(struct notifier_bloc
  {
        if (kaslr_enabled()) {
                pr_emerg("Kernel Offset: 0x%lx from 0x%lx (relocation range: 0x%lx-0x%lx)\n",
 -                       (unsigned long)&_text - __START_KERNEL,
 +                       kaslr_offset(),
                         __START_KERNEL,
                         __START_KERNEL_map,
                         MODULES_VADDR-1);
@@@ -1105,9 -1104,6 +1104,9 @@@ void __init setup_arch(char **cmdline_p
        memblock_set_current_limit(ISA_END_ADDRESS);
        memblock_x86_fill();
  
 +      if (efi_enabled(EFI_BOOT))
 +              efi_find_mirror();
 +
        /*
         * The EFI specification says that boot service code won't be called
         * after ExitBootServices(). This is, in fact, a lie.