powerpc: Repack 64bit CPU features to remove holes

This frees up 7 bits for crazy new CPU features.

Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h
index 1b0dbc88192171e70b6c2b4f6d7d90278f290411..72edbce22c69819414965a4637f6ad523f470538 100644 (file)
--- a/arch/powerpc/include/asm/cputable.h
+++ b/arch/powerpc/include/asm/cputable.h
@@ -148,30 +148,32 @@ extern const char *powerpc_base_platform;
 #define LONG_ASM_CONST(x)              0
 #endif
 
-#define CPU_FTR_HVMODE                 LONG_ASM_CONST(0x0000000200000000)
-#define CPU_FTR_ARCH_201               LONG_ASM_CONST(0x0000000400000000)
-#define CPU_FTR_ARCH_206               LONG_ASM_CONST(0x0000000800000000)
-#define CPU_FTR_CFAR                   LONG_ASM_CONST(0x0000001000000000)
-#define CPU_FTR_IABR                   LONG_ASM_CONST(0x0000002000000000)
-#define CPU_FTR_MMCRA                  LONG_ASM_CONST(0x0000004000000000)
-#define CPU_FTR_CTRL                   LONG_ASM_CONST(0x0000008000000000)
-#define CPU_FTR_SMT                    LONG_ASM_CONST(0x0000010000000000)
-#define CPU_FTR_PAUSE_ZERO             LONG_ASM_CONST(0x0000200000000000)
-#define CPU_FTR_PURR                   LONG_ASM_CONST(0x0000400000000000)
-#define CPU_FTR_CELL_TB_BUG            LONG_ASM_CONST(0x0000800000000000)
-#define CPU_FTR_SPURR                  LONG_ASM_CONST(0x0001000000000000)
-#define CPU_FTR_DSCR                   LONG_ASM_CONST(0x0002000000000000)
-#define CPU_FTR_VSX                    LONG_ASM_CONST(0x0010000000000000)
-#define CPU_FTR_SAO                    LONG_ASM_CONST(0x0020000000000000)
-#define CPU_FTR_CP_USE_DCBTZ           LONG_ASM_CONST(0x0040000000000000)
-#define CPU_FTR_UNALIGNED_LD_STD       LONG_ASM_CONST(0x0080000000000000)
-#define CPU_FTR_ASYM_SMT               LONG_ASM_CONST(0x0100000000000000)
-#define CPU_FTR_STCX_CHECKS_ADDRESS    LONG_ASM_CONST(0x0200000000000000)
-#define CPU_FTR_POPCNTB                        LONG_ASM_CONST(0x0400000000000000)
-#define CPU_FTR_POPCNTD                        LONG_ASM_CONST(0x0800000000000000)
-#define CPU_FTR_ICSWX                  LONG_ASM_CONST(0x1000000000000000)
-#define CPU_FTR_VMX_COPY               LONG_ASM_CONST(0x2000000000000000)
-#define        CPU_FTR_HAS_PPR                 LONG_ASM_CONST(0x4000000000000000)
+#define CPU_FTR_HVMODE                 LONG_ASM_CONST(0x0000000100000000)
+#define CPU_FTR_ARCH_201               LONG_ASM_CONST(0x0000000200000000)
+#define CPU_FTR_ARCH_206               LONG_ASM_CONST(0x0000000400000000)
+#define CPU_FTR_CFAR                   LONG_ASM_CONST(0x0000000800000000)
+#define CPU_FTR_IABR                   LONG_ASM_CONST(0x0000001000000000)
+#define CPU_FTR_MMCRA                  LONG_ASM_CONST(0x0000002000000000)
+#define CPU_FTR_CTRL                   LONG_ASM_CONST(0x0000004000000000)
+#define CPU_FTR_SMT                    LONG_ASM_CONST(0x0000008000000000)
+#define CPU_FTR_PAUSE_ZERO             LONG_ASM_CONST(0x0000010000000000)
+#define CPU_FTR_PURR                   LONG_ASM_CONST(0x0000020000000000)
+#define CPU_FTR_CELL_TB_BUG            LONG_ASM_CONST(0x0000040000000000)
+#define CPU_FTR_SPURR                  LONG_ASM_CONST(0x0000080000000000)
+#define CPU_FTR_DSCR                   LONG_ASM_CONST(0x0000100000000000)
+#define CPU_FTR_VSX                    LONG_ASM_CONST(0x0000200000000000)
+#define CPU_FTR_SAO                    LONG_ASM_CONST(0x0000400000000000)
+#define CPU_FTR_CP_USE_DCBTZ           LONG_ASM_CONST(0x0000800000000000)
+#define CPU_FTR_UNALIGNED_LD_STD       LONG_ASM_CONST(0x0001000000000000)
+#define CPU_FTR_ASYM_SMT               LONG_ASM_CONST(0x0002000000000000)
+#define CPU_FTR_STCX_CHECKS_ADDRESS    LONG_ASM_CONST(0x0004000000000000)
+#define CPU_FTR_POPCNTB                        LONG_ASM_CONST(0x0008000000000000)
+#define CPU_FTR_POPCNTD                        LONG_ASM_CONST(0x0010000000000000)
+#define CPU_FTR_ICSWX                  LONG_ASM_CONST(0x0020000000000000)
+#define CPU_FTR_VMX_COPY               LONG_ASM_CONST(0x0040000000000000)
+#define CPU_FTR_TM                     LONG_ASM_CONST(0x0080000000000000)
+#define CPU_FTR_BCTAR                  LONG_ASM_CONST(0x0100000000000000)
+#define        CPU_FTR_HAS_PPR                 LONG_ASM_CONST(0x0200000000000000)
 
 #ifndef __ASSEMBLY__