diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-15 22:39:18 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-15 22:39:18 +0200 |
| commit | b79d2809555ee907a96d647441b2a3de01088f65 (patch) | |
| tree | 819f7ac2ba133332e389a150d37038f56e936101 /Documentation | |
| parent | 2c299e376d0dba71e53c9dd6e2792dd42fea00e4 (diff) | |
| parent | 64f1607ffbbc772685733ea63e6f7f4183df1b16 (diff) | |
| download | lwn-b79d2809555ee907a96d647441b2a3de01088f65.tar.gz lwn-b79d2809555ee907a96d647441b2a3de01088f65.zip | |
Merge branch 'linus' into rt/base
Conflicts:
fs/xfs/xfs_fsops.c
kernel/futex.c
kernel/irq/manage.c
kernel/perf_counter.c
Fixup of kernel/rtmutex.c vs. atomic_spinlock.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index dd1a6d4bb747..7936b801fe6a 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1115,6 +1115,10 @@ and is between 256 and 4096 characters. It is defined in the file libata.dma=4 Compact Flash DMA only Combinations also work, so libata.dma=3 enables DMA for disks and CDROMs, but not CFs. + + libata.ignore_hpa= [LIBATA] Ignore HPA limit + libata.ignore_hpa=0 keep BIOS limits (default) + libata.ignore_hpa=1 ignore limits, using full disk libata.noacpi [LIBATA] Disables use of ACPI in libata suspend/resume when set. |