From 2648e1a5840948fc3c6cdd228df4cde51a9986a2 Mon Sep 17 00:00:00 2001 From: Nathan Lynch Date: Thu, 10 Jul 2008 01:06:57 +1000 Subject: [PATCH] --- yaml --- r: 101831 b: refs/heads/master c: 0f47331475201c7785454030a9976c8ac902a35d h: refs/heads/master i: 101829: 66fb3bb2905d3e0976e9bf486a2aeed26ef35a4f 101827: 3bf0b542edcb5318ac831e2352b665eb6ee3facf 101823: ea4d55ed7d063f58e1140a37427f522a9be9a182 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/cputable.c | 6 ++++-- trunk/include/asm-powerpc/cputable.h | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7fccd739c15c..6c9100d6b2bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe9e8d53772b5ea9ccf8ea4e8f0f009a6885eb70 +refs/heads/master: 0f47331475201c7785454030a9976c8ac902a35d diff --git a/trunk/arch/powerpc/kernel/cputable.c b/trunk/arch/powerpc/kernel/cputable.c index 72adb19a204d..f7f3c215d06f 100644 --- a/trunk/arch/powerpc/kernel/cputable.c +++ b/trunk/arch/powerpc/kernel/cputable.c @@ -70,10 +70,12 @@ extern void __restore_cpu_power7(void); PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP) #define COMMON_USER_POWER6 (COMMON_USER_PPC64 | PPC_FEATURE_ARCH_2_05 |\ PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP | \ - PPC_FEATURE_TRUE_LE) + PPC_FEATURE_TRUE_LE | \ + PPC_FEATURE_PSERIES_PERFMON_COMPAT) #define COMMON_USER_POWER7 (COMMON_USER_PPC64 | PPC_FEATURE_ARCH_2_06 |\ PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP | \ - PPC_FEATURE_TRUE_LE) + PPC_FEATURE_TRUE_LE | \ + PPC_FEATURE_PSERIES_PERFMON_COMPAT) #define COMMON_USER_PA6T (COMMON_USER_PPC64 | PPC_FEATURE_PA6T |\ PPC_FEATURE_TRUE_LE | \ PPC_FEATURE_HAS_ALTIVEC_COMP) diff --git a/trunk/include/asm-powerpc/cputable.h b/trunk/include/asm-powerpc/cputable.h index 4fd76898975b..2a3e9075a5a0 100644 --- a/trunk/include/asm-powerpc/cputable.h +++ b/trunk/include/asm-powerpc/cputable.h @@ -27,6 +27,9 @@ #define PPC_FEATURE_ARCH_2_06 0x00000100 #define PPC_FEATURE_HAS_VSX 0x00000080 +#define PPC_FEATURE_PSERIES_PERFMON_COMPAT \ + 0x00000040 + #define PPC_FEATURE_TRUE_LE 0x00000002 #define PPC_FEATURE_PPC_LE 0x00000001