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 90cefbddf1eda09a9403a5a157f193b232e106d0..39ac9d4fad7ff35e17e7c4e0ac5dd91ae6f63cfe 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -2758,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
 
@@ -3713,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]