diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-20 11:50:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-20 11:50:01 -0800 |
| commit | 1a7dbbcc8cc6b34f3a4ae92026759fc057ffcba2 (patch) | |
| tree | 1efa6cab2815c889ba8fbc928eab47f76c721e49 /Documentation | |
| parent | 6c6461435611e1d4843516f2d55e8316c009112e (diff) | |
| parent | 5b4d1dbc24bb6fd7179ada0f47be34e27e64decb (diff) | |
| download | linux-1a7dbbcc8cc6b34f3a4ae92026759fc057ffcba2.tar.bz2 | |
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/apic changes from Ingo Molnar:
"Two main changes:
- improve local APIC Error Status Register reporting robustness
- add the 'disable_cpu_apicid=x' boot parameter for kexec booting"
* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, apic: Make disabled_cpu_apicid static read_mostly, fix typos
x86, apic, kexec: Add disable_cpu_apicid kernel parameter
x86/apic: Read Error Status Register correctly
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 0940078edebb..3b8e262c3657 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -774,6 +774,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted. disable= [IPV6] See Documentation/networking/ipv6.txt. + disable_cpu_apicid= [X86,APIC,SMP] + Format: <int> + The number of initial APIC ID for the + corresponding CPU to be disabled at boot, + mostly used for the kdump 2nd kernel to + disable BSP to wake up multiple CPUs without + causing system reset or hang due to sending + INIT from AP to BSP. + disable_ddw [PPC/PSERIES] Disable Dynamic DMA Window support. Use this if to workaround buggy firmware. |