[PATCH 1/2] Power7 architected entry

[jschopp at austin.ibm.com]

Add an entry for Power7 architected mode and add "(raw)" to Power7 raw mode to
distinguish it more clearly.

Signed-off-by: Joel Schopp <jschopp at austin.ibm.com> 
---
 arch/powerpc/kernel/cputable.c             |   48 +++++++++++++++++++++++++++++
 arch/powerpc/platforms/pseries/cpu_setup.S |    6 +++
 include/asm-powerpc/cputable.h             |    9 +++++
 3 files changed, 63 insertions(+)

Index: 2.6.26-rc6/arch/powerpc/kernel/cputable.c
===================================================================
--- 2.6.26-rc6.orig/arch/powerpc/kernel/cputable.c
+++ 2.6.26-rc6/arch/powerpc/kernel/cputable.c
@@ -385,10 +385,21 @@ static struct cpu_spec __initdata cpu_sp
 		.machine_check		= machine_check_generic,
 		.platform		= "power6",
 	},
+	{	/* 2.06-compliant processor, i.e. Power7 "architected" mode */
+		.pvr_mask		= 0xffffffff,
+		.pvr_value		= 0x0f000003,
+		.cpu_name		= "POWER7 (architected)",
+		.cpu_features		= CPU_FTRS_POWER7,
+		.cpu_user_features	= COMMON_USER_POWER7,
+		.icache_bsize		= 128,
+		.dcache_bsize		= 128,
+		.machine_check		= machine_check_generic,
+		.platform		= "power7",
+	},
 	{	/* Power7 */
 		.pvr_mask		= 0xffff0000,
 		.pvr_value		= 0x003f0000,
-		.cpu_name		= "POWER7",
+		.cpu_name		= "POWER7 (raw)",
 		.cpu_features		= CPU_FTRS_POWER7,
 		.cpu_user_features	= COMMON_USER_POWER7,
 		.icache_bsize		= 128,