1 files changed, 78 insertions, 11 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index c3bfacb92910..15356aca938c 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1129,11 +1129,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         The builtin appraise policy appraises all files
                         owned by uid=0.
 
-        ima_audit=      [IMA]
-                        Format: { "0" | "1" }
-                        0 -- integrity auditing messages. (Default)
-                        1 -- enable informational integrity auditing messages.
-
         ima_hash=       [IMA]
                         Format: { "sha1" | "md5" }
                         default: "sha1"
@@ -1158,6 +1153,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
         inport.irq=     [HW] Inport (ATI XL and Microsoft) busmouse driver
                         Format: <irq>
 
+        int_pln_enable  [x86] Enable power limit notification interrupt
+
+        integrity_audit=[IMA]
+                        Format: { "0" | "1" }
+                        0 -- basic integrity auditing messages. (Default)
+                        1 -- additional integrity auditing messages.
+
         intel_iommu=    [DMAR] Intel IOMMU driver (DMAR) option
                 on
                         Enable intel iommu driver.
@@ -1456,6 +1458,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
                         * dump_id: dump IDENTIFY data.
 
+                        * atapi_dmadir: Enable ATAPI DMADIR bridge support
+
                         If there are multiple matching configurations changing
                         the same attribute, the last one is used.
 
@@ -2677,9 +2681,17 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         Run specified binary instead of /init from the ramdisk,
                         used for early userspace startup. See initrd.
 
-        reboot=         [BUGS=X86-32,BUGS=ARM,BUGS=IA-64] Rebooting mode
-                        Format: <reboot_mode>[,<reboot_mode2>[,...]]
-                        See arch/*/kernel/reboot.c or arch/*/kernel/process.c
+        reboot=         [KNL]
+                        Format (x86 or x86_64):
+                                [w[arm] | c[old] | h[ard] | s[oft] | g[pio]] \
+                                [[,]s[mp]#### \
+                                [[,]b[ios] | a[cpi] | k[bd] | t[riple] | e[fi] | p[ci]] \
+                                [[,]f[orce]
+                        Where reboot_mode is one of warm (soft) or cold (hard) or gpio,
+                              reboot_type is one of bios, acpi, kbd, triple, efi, or pci,
+                              reboot_force is either force or not specified,
+                              reboot_cpu is s[mp]#### with #### being the processor
+                                        to be used for rebooting.
 
         relax_domain_level=
                         [KNL, SMP] Set scheduler's default relax_domain_level.
@@ -3005,6 +3017,27 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         Force threading of all interrupt handlers except those
                         marked explicitly IRQF_NO_THREAD.
 
+        tmem            [KNL,XEN]
+                        Enable the Transcendent memory driver if built-in.
+
+        tmem.cleancache=0|1 [KNL, XEN]
+                        Default is on (1). Disable the usage of the cleancache
+                        API to send anonymous pages to the hypervisor.
+
+        tmem.frontswap=0|1 [KNL, XEN]
+                        Default is on (1). Disable the usage of the frontswap
+                        API to send swap pages to the hypervisor. If disabled
+                        the selfballooning and selfshrinking are force disabled.
+
+        tmem.selfballooning=0|1 [KNL, XEN]
+                        Default is on (1). Disable the driving of swap pages
+                        to the hypervisor.
+
+        tmem.selfshrinking=0|1 [KNL, XEN]
+                        Default is on (1). Partial swapoff that immediately
+                        transfers pages from Xen hypervisor back to the
+                        kernel based on different criteria.
+
         topology=       [S390]
                         Format: {off | on}
                         Specify if the kernel should make use of the cpu
@@ -3048,6 +3081,19 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         See also Documentation/trace/ftrace.txt "trace options"
                         section.
 
+        traceoff_on_warning
+                        [FTRACE] enable this option to disable tracing when a
+                        warning is hit. This turns off "tracing_on". Tracing can
+                        be enabled again by echoing '1' into the "tracing_on"
+                        file located in /sys/kernel/debug/tracing/
+
+                        This option is useful, as it disables the trace before
+                        the WARNING dump is called, which prevents the trace to
+                        be filled with content caused by the warning output.
+
+                        This option can also be set at run time via the sysctl
+                        option:  kernel/traceoff_on_warning
+
         transparent_hugepage=
                         [KNL]
                         Format: [always|madvise|never]
@@ -3208,6 +3254,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
         video=          [FB] Frame buffer configuration
                         See Documentation/fb/modedb.txt.
 
+        video.brightness_switch_enabled= [0,1]
+                        If set to 1, on receiving an ACPI notify event
+                        generated by hotkey, video driver will adjust brightness
+                        level and then send out the event to user space through
+                        the allocated input device; If set to 0, video driver
+                        will only send out the event without touching backlight
+                        brightness level.
+                        default: 1
+
         virtio_mmio.device=
                         [VMMIO] Memory mapped virtio (platform) device.
 
@@ -3320,6 +3375,21 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         that this also can be controlled per-workqueue for
                         workqueues visible under /sys/bus/workqueue/.
 
+        workqueue.power_efficient
+                        Per-cpu workqueues are generally preferred because
+                        they show better performance thanks to cache
+                        locality; unfortunately, per-cpu workqueues tend to
+                        be more power hungry than unbound workqueues.
+
+                        Enabling this makes the per-cpu workqueues which
+                        were observed to contribute significantly to power
+                        consumption unbound, leading to measurably lower
+                        power usage at the cost of small performance
+                        overhead.
+
+                        The default value of this parameter is determined by
+                        the config option CONFIG_WQ_POWER_EFFICIENT_DEFAULT.
+
         x2apic_phys     [X86-64,APIC] Use x2apic physical mode instead of
                         default x2apic cluster mode on platforms
                         supporting x2apic.
@@ -3330,9 +3400,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         plus one apbt timer for broadcast timer.
                         x86_mrst_timer=apbt_only | lapic_and_apbt
 
-        xd=             [HW,XT] Original XT pre-IDE (RLL encoded) disks.
-        xd_geo=         See header of drivers/block/xd.c.
-
         xen_emul_unplug=                [HW,X86,XEN]
                         Unplug Xen emulated devices
                         Format: [unplug0,][unplug1]