Merge branch 'linus' into perfcounters/core-v2

[pandora-kernel.git] / arch / x86 / kernel / cpu / amd.c

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 7e4a459..fd69c51 100644 (file)
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -420,6 +420,10 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
        if (c->x86 >= 6)
                set_cpu_cap(c, X86_FEATURE_FXSAVE_LEAK);
 
+       /* Enable Performance counter for K7 and later */
+       if (c->x86 > 6 && c->x86 <= 0x11)
+               set_cpu_cap(c, X86_FEATURE_ARCH_PERFMON);
+
        if (!c->x86_model_id[0]) {
                switch (c->x86) {
                case 0xf: