diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-07-21 11:10:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 21:37:09 -0400 |
commit | f40f31bfe104d50d4fceb760ec48d2effd0610aa (patch) | |
tree | e84c4a24bec1a1dd9302336725277f428f1346ad | |
parent | 7ff984785cf08e96bd46f7d9c7bf4d73f871599b (diff) |
x86_64: Fix APIC typo
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/x86_64/kernel/apic.c | 4 | ||||
-rw-r--r-- | arch/x86_64/kernel/mce_amd.c | 6 | ||||
-rw-r--r-- | include/asm-x86_64/apic.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c index 1b0e07bb8728..4ba5a693c011 100644 --- a/arch/x86_64/kernel/apic.c +++ b/arch/x86_64/kernel/apic.c | |||
@@ -990,8 +990,8 @@ int setup_profiling_timer(unsigned int multiplier) | |||
990 | return -EINVAL; | 990 | return -EINVAL; |
991 | } | 991 | } |
992 | 992 | ||
993 | void setup_APIC_extened_lvt(unsigned char lvt_off, unsigned char vector, | 993 | void setup_APIC_extended_lvt(unsigned char lvt_off, unsigned char vector, |
994 | unsigned char msg_type, unsigned char mask) | 994 | unsigned char msg_type, unsigned char mask) |
995 | { | 995 | { |
996 | unsigned long reg = (lvt_off << 4) + K8_APIC_EXT_LVT_BASE; | 996 | unsigned long reg = (lvt_off << 4) + K8_APIC_EXT_LVT_BASE; |
997 | unsigned int v = (mask << 16) | (msg_type << 8) | vector; | 997 | unsigned int v = (mask << 16) | (msg_type << 8) | vector; |
diff --git a/arch/x86_64/kernel/mce_amd.c b/arch/x86_64/kernel/mce_amd.c index 03356e64f9c8..2f8a7f18b0fe 100644 --- a/arch/x86_64/kernel/mce_amd.c +++ b/arch/x86_64/kernel/mce_amd.c | |||
@@ -157,9 +157,9 @@ void __cpuinit mce_amd_feature_init(struct cpuinfo_x86 *c) | |||
157 | high |= K8_APIC_EXT_LVT_ENTRY_THRESHOLD << 20; | 157 | high |= K8_APIC_EXT_LVT_ENTRY_THRESHOLD << 20; |
158 | wrmsr(address, low, high); | 158 | wrmsr(address, low, high); |
159 | 159 | ||
160 | setup_APIC_extened_lvt(K8_APIC_EXT_LVT_ENTRY_THRESHOLD, | 160 | setup_APIC_extended_lvt(K8_APIC_EXT_LVT_ENTRY_THRESHOLD, |
161 | THRESHOLD_APIC_VECTOR, | 161 | THRESHOLD_APIC_VECTOR, |
162 | K8_APIC_EXT_INT_MSG_FIX, 0); | 162 | K8_APIC_EXT_INT_MSG_FIX, 0); |
163 | 163 | ||
164 | threshold_defaults.address = address; | 164 | threshold_defaults.address = address; |
165 | threshold_restart_bank(&threshold_defaults, 0, 0); | 165 | threshold_restart_bank(&threshold_defaults, 0, 0); |
diff --git a/include/asm-x86_64/apic.h b/include/asm-x86_64/apic.h index 4c2d84dd4f2b..85125ef3c414 100644 --- a/include/asm-x86_64/apic.h +++ b/include/asm-x86_64/apic.h | |||
@@ -83,8 +83,8 @@ extern void disable_APIC_timer(void); | |||
83 | extern void enable_APIC_timer(void); | 83 | extern void enable_APIC_timer(void); |
84 | extern void setup_apic_routing(void); | 84 | extern void setup_apic_routing(void); |
85 | 85 | ||
86 | extern void setup_APIC_extened_lvt(unsigned char lvt_off, unsigned char vector, | 86 | extern void setup_APIC_extended_lvt(unsigned char lvt_off, unsigned char vector, |
87 | unsigned char msg_type, unsigned char mask); | 87 | unsigned char msg_type, unsigned char mask); |
88 | 88 | ||
89 | extern int apic_is_clustered_box(void); | 89 | extern int apic_is_clustered_box(void); |
90 | 90 | ||