diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-23 14:32:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-23 14:32:31 -0400 |
commit | 2e7c28382b8426c6b7ac6f147177a664065f95f4 (patch) | |
tree | d5ca1338cdafabc1e8accab224dcac49278d1f05 /arch/x86_64/kernel/apic.c | |
parent | cad6a84a3913bc2d8a7ebb183e385dd6a2b76438 (diff) |
x86-64: add "local_apic_timer_c2_ok" here too
Needed for any architecture that claims ARCH_APICTIMER_STOPS_ON_C3,
not just i386.
I'm hoping Thomas will clean this up a bit later..
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86_64/kernel/apic.c')
-rw-r--r-- | arch/x86_64/kernel/apic.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c index 723417d924c0..46acf4f2f1ec 100644 --- a/arch/x86_64/kernel/apic.c +++ b/arch/x86_64/kernel/apic.c | |||
@@ -47,6 +47,10 @@ int apic_calibrate_pmtmr __initdata; | |||
47 | 47 | ||
48 | int disable_apic_timer __initdata; | 48 | int disable_apic_timer __initdata; |
49 | 49 | ||
50 | /* Local APIC timer works in C2? */ | ||
51 | int local_apic_timer_c2_ok; | ||
52 | EXPORT_SYMBOL_GPL(local_apic_timer_c2_ok); | ||
53 | |||
50 | static struct resource *ioapic_resources; | 54 | static struct resource *ioapic_resources; |
51 | static struct resource lapic_resource = { | 55 | static struct resource lapic_resource = { |
52 | .name = "Local APIC", | 56 | .name = "Local APIC", |
@@ -1192,6 +1196,13 @@ static __init int setup_nolapic(char *str) | |||
1192 | } | 1196 | } |
1193 | early_param("nolapic", setup_nolapic); | 1197 | early_param("nolapic", setup_nolapic); |
1194 | 1198 | ||
1199 | static int __init parse_lapic_timer_c2_ok(char *arg) | ||
1200 | { | ||
1201 | local_apic_timer_c2_ok = 1; | ||
1202 | return 0; | ||
1203 | } | ||
1204 | early_param("lapic_timer_c2_ok", parse_lapic_timer_c2_ok); | ||
1205 | |||
1195 | static __init int setup_noapictimer(char *str) | 1206 | static __init int setup_noapictimer(char *str) |
1196 | { | 1207 | { |
1197 | if (str[0] != ' ' && str[0] != 0) | 1208 | if (str[0] != ' ' && str[0] != 0) |