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

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

1 files changed, 5 insertions, 0 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 1da946548772..e567af39ee34 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -564,6 +564,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         UART at the specified I/O port or MMIO address,
                         switching to the matching ttyS device later.  The
                         options are the same as for ttyS, above.
+                hvc<n>  Use the hypervisor console device <n>. This is for
+                        both Xen and PowerPC hypervisors.
 
                 If the device connected to the port is not a TTY but a braille
                 device, prepend "brl," before the device type, for instance
@@ -757,6 +759,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
         earlyprintk=    [X86,SH,BLACKFIN]
                         earlyprintk=vga
+                        earlyprintk=xen
                         earlyprintk=serial[,ttySn[,baudrate]]
                         earlyprintk=ttySn[,baudrate]
                         earlyprintk=dbgp[debugController#]
@@ -774,6 +777,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         The VGA output is eventually overwritten by the real
                         console.
 
+                        The xen output can only be used by Xen PV guests.
+
         ekgdboc=        [X86,KGDB] Allow early kernel console debugging
                         ekgdboc=kbd