These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / Documentation / x86 / boot.txt

diff --git a/kernel/Documentation/x86/boot.txt b/kernel/Documentation/x86/boot.txt
index 88b8589..9da6f35 100644 (file)
--- a/kernel/Documentation/x86/boot.txt
+++ b/kernel/Documentation/x86/boot.txt
@@ -406,7 +406,7 @@ Protocol:   2.00+
        - If 0, the protected-mode code is loaded at 0x10000.
        - If 1, the protected-mode code is loaded at 0x100000.
 
-  Bit 1 (kernel internal): ALSR_FLAG
+  Bit 1 (kernel internal): KASLR_FLAG
        - Used internally by the compressed kernel to communicate
          KASLR status to kernel proper.
          If 1, KASLR enabled.
@@ -1124,7 +1124,6 @@ The boot loader *must* fill out the following fields in bp,
 
     o hdr.code32_start
     o hdr.cmd_line_ptr
-    o hdr.cmdline_size
     o hdr.ramdisk_image (if applicable)
     o hdr.ramdisk_size  (if applicable)