summaryrefslogtreecommitdiff
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2012-01-04 15:00:43 +0100
committerIngo Molnar <mingo@elte.hu>2012-01-04 15:01:28 +0100
commitadaf4ed2abbd285c93808060924eeec3af483aee (patch)
tree425c6c37c08af0b69efaa7457c9b428eda347c36 /Documentation/kernel-parameters.txt
parentca3d30cc02f780f68771087040ce935add6ba2b7 (diff)
parent5f0a6e2d503896062f641639dacfe5055c2f593b (diff)
downloadlwn-adaf4ed2abbd285c93808060924eeec3af483aee.tar.gz
lwn-adaf4ed2abbd285c93808060924eeec3af483aee.zip
Merge commit 'v3.2-rc7' into x86/asm
Merge reason: Update from -rc4 to -rc7. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index ce7fc8b3e2c0..6c04e9160c63 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -315,12 +315,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
CPU-intensive style benchmark, and it can vary highly in
a microbenchmark depending on workload and compiler.
- 1: only for 32-bit processes
- 2: only for 64-bit processes
+ 32: only for 32-bit processes
+ 64: only for 64-bit processes
on: enable for both 32- and 64-bit processes
off: disable for both 32- and 64-bit processes
- amd_iommu= [HW,X86-84]
+ amd_iommu= [HW,X86-64]
Pass parameters to the AMD IOMMU driver in the system.
Possible values are:
fullflush - enable flushing of IO/TLB entries when