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

[linux-2.6-microblaze.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index b0a42f3..9d699c8 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -587,11 +587,6 @@
                        Sets the size of memory pool for coherent, atomic dma
                        allocations, by default set to 256K.
 
-       code_bytes      [X86] How many bytes of object code to print
-                       in an oops report.
-                       Range: 0 - 8192
-                       Default: 64
-
        com20020=       [HW,NET] ARCnet - COM20020 chipset
                        Format:
                        <io>[,<irq>[,<nodeID>[,<backplane>[,<ckp>[,<timeout>]]]]]
@@ -2608,6 +2603,9 @@
                        emulation library even if a 387 maths coprocessor
                        is present.
 
+       no5lvl          [X86-64] Disable 5-level paging mode. Forces
+                       kernel to use 4-level paging instead.
+
        no_console_suspend
                        [HW] Never suspend the console
                        Disable suspending of consoles during suspend and