Merge branch 'linus' into sched/urgent, to resolve conflicts

[sfrench/cifs-2.6.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index b98048b56ada9c9e6ab38c5b06d6c74b549ecc03..39ac9d4fad7ff35e17e7c4e0ac5dd91ae6f63cfe 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -646,6 +646,20 @@
                        console=brl,ttyS0
                For now, only VisioBraille is supported.
 
+       console_msg_format=
+                       [KNL] Change console messages format
+               default
+                       By default we print messages on consoles in
+                       "[time stamp] text\n" format (time stamp may not be
+                       printed, depending on CONFIG_PRINTK_TIME or
+                       `printk_time' param).
+               syslog
+                       Switch to syslog format: "<%u>[time stamp] text\n"
+                       IOW, each message will have a facility and loglevel
+                       prefix. The format is similar to one used by syslog()
+                       syscall, or to executing "dmesg -S --raw" or to reading
+                       from /proc/kmsg.
+
        consoleblank=   [KNL] The console blank (screen saver) timeout in
                        seconds. A value of 0 disables the blank timer.
                        Defaults to 0.
@@ -2538,6 +2552,9 @@
                        This is useful when you use a panic=... timeout and
                        need the box quickly up again.
 
+                       These settings can be accessed at runtime via
+                       the nmi_watchdog and hardlockup_panic sysctls.
+
        netpoll.carrier_timeout=
                        [NET] Specifies amount of time (in seconds) that
                        netpoll should wait for a carrier. By default netpoll
@@ -2741,8 +2758,6 @@
        norandmaps      Don't use address space randomization.  Equivalent to
                        echo 0 > /proc/sys/kernel/randomize_va_space
 
-       noreplace-paravirt      [X86,IA-64,PV_OPS] Don't patch paravirt_ops
-
        noreplace-smp   [X86-32,SMP] Don't replace SMP instructions
                        with UP alternatives
 
@@ -3696,7 +3711,11 @@
                        [KNL, SMP] Set scheduler's default relax_domain_level.
                        See Documentation/cgroup-v1/cpusets.txt.
 
-       reserve=        [KNL,BUGS] Force the kernel to ignore some iomem area
+       reserve=        [KNL,BUGS] Force kernel to ignore I/O ports or memory
+                       Format: <base1>,<size1>[,<base2>,<size2>,...]
+                       Reserve I/O ports or memory so the kernel won't use
+                       them.  If <base> is less than 0x10000, the region
+                       is assumed to be I/O ports; otherwise it is memory.
 
        reservetop=     [X86-32]
                        Format: nn[KMG]