From 9d1e301604da16c6ee9881777194ed484ff0078b Mon Sep 17 00:00:00 2001 From: Nishanth Aravamudan Date: Fri, 3 May 2013 14:47:56 +0000 Subject: [PATCH] --- yaml --- r: 373765 b: refs/heads/master c: cbbc6f1b1433ef553d57826eee87a84ca49645ce h: refs/heads/master i: 373763: 6cb1a1d0ac2eff6d1814c7035b20492b656a1b01 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/cputable.h | 2 ++ trunk/arch/powerpc/include/uapi/asm/cputable.h | 9 +++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 853a82f718ba..31db887c8cb3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d82fb31abc46620b7c22758c75707069f2763646 +refs/heads/master: cbbc6f1b1433ef553d57826eee87a84ca49645ce diff --git a/trunk/arch/powerpc/include/asm/cputable.h b/trunk/arch/powerpc/include/asm/cputable.h index fcc54ad159ba..26807e5aff51 100644 --- a/trunk/arch/powerpc/include/asm/cputable.h +++ b/trunk/arch/powerpc/include/asm/cputable.h @@ -224,8 +224,10 @@ extern const char *powerpc_base_platform; /* We only set the TM feature if the kernel was compiled with TM supprt */ #ifdef CONFIG_PPC_TRANSACTIONAL_MEM #define CPU_FTR_TM_COMP CPU_FTR_TM +#define PPC_FEATURE2_HTM_COMP PPC_FEATURE2_HTM #else #define CPU_FTR_TM_COMP 0 +#define PPC_FEATURE2_HTM_COMP 0 #endif /* We need to mark all pages as being coherent if we're SMP or we have a diff --git a/trunk/arch/powerpc/include/uapi/asm/cputable.h b/trunk/arch/powerpc/include/uapi/asm/cputable.h index ed9dd8156962..5b7657959faa 100644 --- a/trunk/arch/powerpc/include/uapi/asm/cputable.h +++ b/trunk/arch/powerpc/include/uapi/asm/cputable.h @@ -1,6 +1,7 @@ #ifndef _UAPI__ASM_POWERPC_CPUTABLE_H #define _UAPI__ASM_POWERPC_CPUTABLE_H +/* in AT_HWCAP */ #define PPC_FEATURE_32 0x80000000 #define PPC_FEATURE_64 0x40000000 #define PPC_FEATURE_601_INSTR 0x20000000 @@ -33,4 +34,12 @@ #define PPC_FEATURE_TRUE_LE 0x00000002 #define PPC_FEATURE_PPC_LE 0x00000001 +/* in AT_HWCAP2 */ +#define PPC_FEATURE2_ARCH_2_07 0x80000000 +#define PPC_FEATURE2_HTM 0x40000000 +#define PPC_FEATURE2_DSCR 0x20000000 +#define PPC_FEATURE2_EBB 0x10000000 +#define PPC_FEATURE2_ISEL 0x08000000 +#define PPC_FEATURE2_TAR 0x04000000 + #endif /* _UAPI__ASM_POWERPC_CPUTABLE_H */