diff options
-rw-r--r-- | arch/x86/kernel/cpu/amd.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index dcf6bbb1c7c0..5f8af875f457 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c | |||
@@ -4,6 +4,7 @@ | |||
4 | #include <asm/io.h> | 4 | #include <asm/io.h> |
5 | #include <asm/processor.h> | 5 | #include <asm/processor.h> |
6 | #include <asm/apic.h> | 6 | #include <asm/apic.h> |
7 | #include <asm/mach_apic.h> | ||
7 | 8 | ||
8 | #include "cpu.h" | 9 | #include "cpu.h" |
9 | 10 | ||
@@ -45,13 +46,17 @@ static __cpuinit int amd_apic_timer_broken(void) | |||
45 | case CPUID_XFAM_10H: | 46 | case CPUID_XFAM_10H: |
46 | case CPUID_XFAM_11H: | 47 | case CPUID_XFAM_11H: |
47 | rdmsr(MSR_K8_ENABLE_C1E, lo, hi); | 48 | rdmsr(MSR_K8_ENABLE_C1E, lo, hi); |
48 | if (lo & ENABLE_C1E_MASK) | 49 | if (lo & ENABLE_C1E_MASK) { |
50 | if (smp_processor_id() != boot_cpu_physical_apicid) | ||
51 | printk(KERN_INFO "AMD C1E detected late. " | ||
52 | " Force timer broadcast.\n"); | ||
49 | return 1; | 53 | return 1; |
50 | break; | 54 | } |
51 | default: | 55 | break; |
52 | /* err on the side of caution */ | 56 | default: |
57 | /* err on the side of caution */ | ||
53 | return 1; | 58 | return 1; |
54 | } | 59 | } |
55 | return 0; | 60 | return 0; |
56 | } | 61 | } |
57 | #endif | 62 | #endif |