diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-31 12:59:43 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-31 12:59:43 +1000 |
| commit | 6cb3491ad3009ea190b2fe72af8ba601d330cf9b (patch) | |
| tree | 1d4f1789d021f623dae66c3c9a9666d70a97f835 /Documentation/kernel-parameters.txt | |
| parent | 2ef0ff4d6f727d87463d324f338941c56b2c6bb0 (diff) | |
| parent | b6738526435d40218e1bd9c5a2ff793361d55e7a (diff) | |
Merge commit 'x86/auto-x86-next'
Conflicts:
arch/x86/kernel/genapic_64.c
drivers/pci/dmar.c
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index e7bea3e85304..0f130a4f9ba3 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1420,6 +1420,12 @@ and is between 256 and 4096 characters. It is defined in the file nolapic_timer [X86-32,APIC] Do not use the local APIC timer. + nox2apic [X86-64,APIC] Do not enable x2APIC mode. + + x2apic_phys [X86-64,APIC] Use x2apic physical mode instead of + default x2apic cluster mode on platforms + supporting x2apic. + noltlbs [PPC] Do not use large page/tlb entries for kernel lowmem mapping on PPC40x. |