1 files changed, 24 insertions, 0 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 25d298517104..ce1f2c85e20f 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -104,6 +104,9 @@ loader, and have no meaning to the kernel directly.
 Do not modify the syntax of boot loader parameters without extreme
 need or coordination with <Documentation/i386/boot.txt>.
 
+There are also arch-specific kernel-parameters not documented here.
+See for example <Documentation/x86_64/boot-options.txt>.
+
 Note that ALL kernel parameters listed below are CASE SENSITIVE, and that
 a trailing = on the name of any parameter states that that parameter will
 be entered as an environment variable, whereas its absence indicates that
@@ -361,6 +364,11 @@ and is between 256 and 4096 characters. It is defined in the file
                         clocksource is not available, it defaults to PIT.
                         Format: { pit | tsc | cyclone | pmtmr }
 
+        code_bytes      [IA32] How many bytes of object code to print in an
+                        oops report.
+                        Range: 0 - 8192
+                        Default: 64
+
         disable_8254_timer
         enable_8254_timer
                         [IA32/X86_64] Disable/Enable interrupt 0 timer routing
@@ -601,6 +609,10 @@ and is between 256 and 4096 characters. It is defined in the file
                         highmem otherwise. This also works to reduce highmem
                         size on bigger boxes.
 
+        highres=        [KNL] Enable/disable high resolution timer mode.
+                        Valid parameters: "on", "off"
+                        Default: "on"
+
         hisax=          [HW,ISDN]
                         See Documentation/isdn/README.HiSax.
 
@@ -1070,6 +1082,10 @@ and is between 256 and 4096 characters. It is defined in the file
                         in certain environments such as networked servers or
                         real-time systems.
 
+        nohz=           [KNL] Boottime enable/disable dynamic ticks
+                        Valid arguments: on, off
+                        Default: on
+
         noirqbalance    [IA-32,SMP,KNL] Disable kernel irq balancing
 
         noirqdebug      [IA-32] Disables the code which attempts to detect and
@@ -1259,6 +1275,12 @@ and is between 256 and 4096 characters. It is defined in the file
                                 This sorting is done to get a device
                                 order compatible with older (<= 2.4) kernels.
                 nobfsort        Don't sort PCI devices into breadth-first order.
+                cbiosize=nn[KMG]        The fixed amount of bus space which is
+                                reserved for the CardBus bridge's IO window.
+                                The default value is 256 bytes.
+                cbmemsize=nn[KMG]       The fixed amount of bus space which is
+                                reserved for the CardBus bridge's memory
+                                window. The default value is 64 megabytes.
 
         pcmv=           [HW,PCMCIA] BadgePAD 4
 
@@ -1396,6 +1418,8 @@ and is between 256 and 4096 characters. It is defined in the file
                         in <PAGE_SIZE> units (needed only for swap files).
                         See  Documentation/power/swsusp-and-swap-files.txt
 
+        retain_initrd   [RAM] Keep initrd memory after extraction
+
         rhash_entries=  [KNL,NET]
                         Set number of hash buckets for route cache