Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[~andy/linux] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 68e7694c0ac77a3052c028436a47268b3e9ff223..a2d8805c03d5588f317a9677add758c94051e6a6 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -823,6 +823,9 @@ and is between 256 and 4096 characters. It is defined in the file
 
        hlt             [BUGS=ARM,SH]
 
+       hvc_iucv=       [S390] Number of z/VM IUCV Hypervisor console (HVC)
+                              back-ends. Valid parameters: 0..8
+
        i8042.debug     [HW] Toggle i8042 debug mode
        i8042.direct    [HW] Put keyboard port into non-translated mode
        i8042.dumbkbd   [HW] Pretend that controller can only read data from
@@ -2292,6 +2295,14 @@ and is between 256 and 4096 characters. It is defined in the file
                        See comment before function dc390_setup() in
                        drivers/scsi/tmscsim.c.
 
+       topology=       [S390]
+                       Format: {off | on}
+                       Specify if the kernel should make use of the cpu
+                       topology informations if the hardware supports these.
+                       The scheduler will make use of these informations and
+                       e.g. base its process migration decisions on it.
+                       Default is off.
+
        tp720=          [HW,PS2]
 
        trix=           [HW,OSS] MediaTrix AudioTrix Pro