lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] kexec: x86: local apic fix

Browse Source 
From: "Maciej W. Rozycki" <macro@linux-mips.org>

Fix a kexec problem whcih causes local APIC detection failure.

The problem is detect_init_APIC() is called early, before the command line
have been processed.  Therefore "lapic" (and "nolapic") have not been seen,
yet.

Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Eric Biederman <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Eric W. Biederman
2005-06-25 14:57:41 -07:00
committed by Linus Torvalds
parent 8f43d03fe2
commit 9635b47d91
3 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
arch/i386/kernel/apic.c
View File

@@ -40,6 +40,11 @@
#include "io_ports.h"
/*
* Knob to control our willingness to enable the local APIC.
*/
int enable_local_apic __initdata = 0; /* -1=force-disable, +1=force-enable */
/*
* Debug level
*/
@@ -666,26 +671,6 @@ static void apic_pm_activate(void) { }
* Original code written by Keir Fraser.
*/
/*
* Knob to control our willingness to enable the local APIC.
*/
int enable_local_apic __initdata = 0; /* -1=force-disable, +1=force-enable */
static int __init lapic_disable(char *str)
{
enable_local_apic = -1;
clear_bit(X86_FEATURE_APIC, boot_cpu_data.x86_capability);
return 0;
}
__setup("nolapic", lapic_disable);
static int __init lapic_enable(char *str)
{
enable_local_apic = 1;
return 0;
}
__setup("lapic", lapic_enable);
static int __init apic_set_verbosity(char *str)
{
if (strcmp("debug", str) == 0)