aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/DocBook/s390-drivers.tmpl1
-rw-r--r--Documentation/cpu-hotplug.txt2
-rw-r--r--Documentation/kernel-parameters.txt9
-rw-r--r--Documentation/s390/CommonIO5
4 files changed, 15 insertions, 2 deletions
diff --git a/Documentation/DocBook/s390-drivers.tmpl b/Documentation/DocBook/s390-drivers.tmpl
index 254e769282a4..3d2f31b99dd9 100644
--- a/Documentation/DocBook/s390-drivers.tmpl
+++ b/Documentation/DocBook/s390-drivers.tmpl
@@ -116,6 +116,7 @@
116!Iinclude/asm-s390/ccwdev.h 116!Iinclude/asm-s390/ccwdev.h
117!Edrivers/s390/cio/device.c 117!Edrivers/s390/cio/device.c
118!Edrivers/s390/cio/device_ops.c 118!Edrivers/s390/cio/device_ops.c
119!Edrivers/s390/cio/airq.c
119 </sect1> 120 </sect1>
120 <sect1 id="cmf"> 121 <sect1 id="cmf">
121 <title>The channel-measurement facility</title> 122 <title>The channel-measurement facility</title>
diff --git a/Documentation/cpu-hotplug.txt b/Documentation/cpu-hotplug.txt
index fb94f5a71b68..ba0aacde94fb 100644
--- a/Documentation/cpu-hotplug.txt
+++ b/Documentation/cpu-hotplug.txt
@@ -50,7 +50,7 @@ additional_cpus=n (*) Use this to limit hotpluggable cpus. This option sets
50 cpu_possible_map = cpu_present_map + additional_cpus 50 cpu_possible_map = cpu_present_map + additional_cpus
51 51
52(*) Option valid only for following architectures 52(*) Option valid only for following architectures
53- x86_64, ia64, s390 53- x86_64, ia64
54 54
55ia64 and x86_64 use the number of disabled local apics in ACPI tables MADT 55ia64 and x86_64 use the number of disabled local apics in ACPI tables MADT
56to determine the number of potentially hot-pluggable cpus. The implementation 56to determine the number of potentially hot-pluggable cpus. The implementation
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 65de5ba7b74c..880f882160e2 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -370,7 +370,8 @@ and is between 256 and 4096 characters. It is defined in the file
370 configured. Potentially dangerous and should only be 370 configured. Potentially dangerous and should only be
371 used if you are entirely sure of the consequences. 371 used if you are entirely sure of the consequences.
372 372
373 chandev= [HW,NET] Generic channel device initialisation 373 ccw_timeout_log [S390]
374 See Documentation/s390/CommonIO for details.
374 375
375 checkreqprot [SELINUX] Set initial checkreqprot flag value. 376 checkreqprot [SELINUX] Set initial checkreqprot flag value.
376 Format: { "0" | "1" } 377 Format: { "0" | "1" }
@@ -382,6 +383,12 @@ and is between 256 and 4096 characters. It is defined in the file
382 Value can be changed at runtime via 383 Value can be changed at runtime via
383 /selinux/checkreqprot. 384 /selinux/checkreqprot.
384 385
386 cio_ignore= [S390]
387 See Documentation/s390/CommonIO for details.
388
389 cio_msg= [S390]
390 See Documentation/s390/CommonIO for details.
391
385 clock= [BUGS=X86-32, HW] gettimeofday clocksource override. 392 clock= [BUGS=X86-32, HW] gettimeofday clocksource override.
386 [Deprecated] 393 [Deprecated]
387 Forces specified clocksource (if available) to be used 394 Forces specified clocksource (if available) to be used
diff --git a/Documentation/s390/CommonIO b/Documentation/s390/CommonIO
index 86320aa3fb0b..8fbc0a852870 100644
--- a/Documentation/s390/CommonIO
+++ b/Documentation/s390/CommonIO
@@ -4,6 +4,11 @@ S/390 common I/O-Layer - command line parameters, procfs and debugfs entries
4Command line parameters 4Command line parameters
5----------------------- 5-----------------------
6 6
7* ccw_timeout_log
8
9 Enable logging of debug information in case of ccw device timeouts.
10
11
7* cio_msg = yes | no 12* cio_msg = yes | no
8 13
9 Determines whether information on found devices and sensed device 14 Determines whether information on found devices and sensed device