summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-19 13:23:50 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-19 13:23:50 -0800
commit901ea4a07988043ff8c6f4f275ab680a23b8bbcd (patch)
tree9301cf0d28e8f6b58e5ed1458eca7e3a95906a9c /Documentation
parent2370965c5065b24b28b5ba09b60ddfbfb6d7649b (diff)
parent9de1cc9c446d39546a3d9dd6f7d99a980a7ecc22 (diff)
Merge branch 'acpi' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'acpi' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PATCH] libata: wrong sizeof for BUFFER [PATCH] libata: change order of _SDD/_GTF execution (resend #3) [PATCH] libata: ACPI _SDD support [PATCH] libata: ACPI and _GTF support
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index ce1f2c85e20..35470de14a9 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -48,6 +48,7 @@ parameter is applicable:
ISAPNP ISA PnP code is enabled.
ISDN Appropriate ISDN support is enabled.
JOY Appropriate joystick support is enabled.
+ LIBATA Libata driver is enabled
LP Printer support is enabled.
LOOP Loopback device support is enabled.
M68k M68k architecture is enabled.
@@ -1038,6 +1039,10 @@ and is between 256 and 4096 characters. It is defined in the file
emulation library even if a 387 maths coprocessor
is present.
+ noacpi [LIBATA] Disables use of ACPI in libata suspend/resume
+ when set.
+ Format: <int>
+
noaliencache [MM, NUMA] Disables the allcoation of alien caches in
the slab allocator. Saves per-node memory, but will
impact performance on real NUMA hardware.