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

Pull more x86 fixes from Peter Anvin:
 "Additional x86 fixes.  Three of these patches are pure documentation,
  two are pretty trivial; the remaining one fixes boot problems on some
  non-BIOS machines."

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Make sure we can boot in the case the BDA contains pure garbage
  x86, efi: Mark disable_runtime as __initdata
  x86, doc: Fix incorrect comment about 64-bit code segment descriptors
  doc, kernel-parameters: Document 'console=hvc<n>'
  doc, xen: Mention 'earlyprintk=xen' in the documentation.
  ACPI: Overriding ACPI tables via initrd only works with an initrd and on X86

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/x86/kernel/head_64.S
index b7de3b25adb53aa96d2bd7f39828e7ba6ae6cdff,37f5304e80f5a740a4bf262d65936bfb36842d05..6859e962644216747de33f8f6fec331f67e24f7f
--- 1/arch/x86/kernel/head_64.S
--- 2/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@@ -47,8 -47,9 +47,8 @@@ L3_START_KERNEL = pud_index(__START_KER
        .code64
        .globl startup_64
  startup_64:
 -
        /*
-        * At this point the CPU runs in 64bit mode CS.L = 1 CS.D = 1,
+        * At this point the CPU runs in 64bit mode CS.L = 1 CS.D = 0,
         * and someone has loaded an identity mapped page table
         * for us.  These identity mapped page tables map all of the
         * kernel pages and possibly all of memory.
@@@ -155,14 -139,17 +155,14 @@@
        /* Fixup phys_base */
        addq    %rbp, phys_base(%rip)
  
 -      /* Due to ENTRY(), sometimes the empty space gets filled with
 -       * zeros. Better take a jmp than relying on empty space being
 -       * filled with 0x90 (nop)
 -       */
 -      jmp secondary_startup_64
 +      movq    $(early_level4_pgt - __START_KERNEL_map), %rax
 +      jmp 1f
  ENTRY(secondary_startup_64)
        /*
-        * At this point the CPU runs in 64bit mode CS.L = 1 CS.D = 1,
+        * At this point the CPU runs in 64bit mode CS.L = 1 CS.D = 0,
         * and someone has loaded a mapped page table.
         *
 -       * %esi holds a physical pointer to real_mode_data.
 +       * %rsi holds a physical pointer to real_mode_data.
         *
         * We come here either from startup_64 (using physical addresses)
         * or from trampoline.S (using virtual addresses).

diff --cc arch/x86/platform/efi/efi.c
Simple merge

diff --cc drivers/acpi/Kconfig
Simple merge