Merge branch 'origin' into devel

[linux-2.6-omap-h63xx.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index ef9827f7c84efffbf5f2c8ef1ef4f01720287b48..6dda1cc3fbafe6b43f4adb914537bc597d72b390 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -44,6 +44,7 @@ parameter is applicable:
        FB      The frame buffer device is enabled.
        HW      Appropriate hardware is enabled.
        IA-64   IA-64 architecture is enabled.
        FB      The frame buffer device is enabled.
        HW      Appropriate hardware is enabled.
        IA-64   IA-64 architecture is enabled.

+       IMA     Integrity measurement architecture is enabled.

        IOSCHED More than one I/O scheduler is enabled.
        IP_PNP  IP DHCP, BOOTP, or RARP is enabled.
        ISAPNP  ISA PnP code is enabled.
        IOSCHED More than one I/O scheduler is enabled.
        IP_PNP  IP DHCP, BOOTP, or RARP is enabled.
        ISAPNP  ISA PnP code is enabled.


@@ -492,10 +493,12 @@ and is between 256 and 4096 characters. It is defined in the file
                        Default: 64
 
        hpet=           [X86-32,HPET] option to control HPET usage
                        Default: 64
 
        hpet=           [X86-32,HPET] option to control HPET usage

-                       Format: { enable (default) | disable | force }
+                       Format: { enable (default) | disable | force |
+                               verbose }

                        disable: disable HPET and use PIT instead
                        force: allow force enabled of undocumented chips (ICH4,
                        VIA, nVidia)
                        disable: disable HPET and use PIT instead
                        force: allow force enabled of undocumented chips (ICH4,
                        VIA, nVidia)

+                       verbose: show contents of HPET registers during setup

 
        com20020=       [HW,NET] ARCnet - COM20020 chipset
                        Format:
 
        com20020=       [HW,NET] ARCnet - COM20020 chipset
                        Format:


@@ -829,6 +832,9 @@ and is between 256 and 4096 characters. It is defined in the file
 
        hvc_iucv=       [S390] Number of z/VM IUCV hypervisor console (HVC)
                               terminal devices. Valid values: 0..8
 
        hvc_iucv=       [S390] Number of z/VM IUCV hypervisor console (HVC)
                               terminal devices. Valid values: 0..8

+       hvc_iucv_allow= [S390] Comma-separated list of z/VM user IDs.
+                              If specified, z/VM IUCV HVC accepts connections
+                              from listed z/VM user IDs only.

 
        i2c_bus=        [HW] Override the default board specific I2C bus speed
                             or register an additional I2C bus that is not
 
        i2c_bus=        [HW] Override the default board specific I2C bus speed
                             or register an additional I2C bus that is not


@@ -908,6 +914,15 @@ and is between 256 and 4096 characters. It is defined in the file
        ihash_entries=  [KNL]
                        Set number of hash buckets for inode cache.
 
        ihash_entries=  [KNL]
                        Set number of hash buckets for inode cache.
 

+       ima_audit=      [IMA]
+                       Format: { "0" | "1" }
+                       0 -- integrity auditing messages. (Default)
+                       1 -- enable informational integrity auditing messages.
+
+       ima_hash=       [IMA]
+                       Formt: { "sha1" | "md5" }
+                       default: "sha1"
+

        in2000=         [HW,SCSI]
                        See header of drivers/scsi/in2000.c.
 
        in2000=         [HW,SCSI]
                        See header of drivers/scsi/in2000.c.
 


@@ -1822,11 +1837,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        autoconfiguration.
                        Ranges are in pairs (memory base and size).
 
                        autoconfiguration.
                        Ranges are in pairs (memory base and size).
 

-       dynamic_printk  Enables pr_debug()/dev_dbg() calls if
-                       CONFIG_DYNAMIC_PRINTK_DEBUG has been enabled.
-                       These can also be switched on/off via
-                       <debugfs>/dynamic_printk/modules
-

        print-fatal-signals=
                        [KNL] debug: print fatal signals
                        print-fatal-signals=1: print segfault info to
        print-fatal-signals=
                        [KNL] debug: print fatal signals
                        print-fatal-signals=1: print segfault info to