[Gc-linux-cvs] linux/arch/powerpc/kernel cputable.c,1.4,1.5

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/arch/powerpc/kernel
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28930/arch/powerpc/kernel

Modified Files:
	cputable.c 
Log Message:
Apply:
gc-linux+fix_cputable-2.6.27.patch
gcnfb+fix_mmap-2.6.27.patch
usbgecko_udbg+safeness.patch
rvl-sthcd+workaround_7005.patch


Index: cputable.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/cputable.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cputable.c	15 Nov 2008 20:10:14 -0000	1.4
+++ cputable.c	25 Nov 2008 19:09:31 -0000	1.5
@@ -640,11 +640,11 @@
 		.machine_check		= machine_check_generic,
 		.platform		= "ppc750",
 	},
-	{	/* 750CL "Broadway" (87200) */
-		.pvr_mask		= 0xffffffff,
-		.pvr_value		= 0x00087200,
-		.cpu_name		= "750CL",
-		.cpu_features		= CPU_FTRS_750CL,
+	{	/* 745/755 */
+		.pvr_mask		= 0xfffff000,
+		.pvr_value		= 0x00083000,
+		.cpu_name		= "745/755",
+		.cpu_features		= CPU_FTRS_750,
 		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,
 		.icache_bsize		= 32,
 		.dcache_bsize		= 32,
@@ -653,9 +653,9 @@
 		.machine_check		= machine_check_generic,
 		.platform		= "ppc750",
 	},
-	{	/* 750CL */
-		.pvr_mask		= 0xfffff0f0,
-		.pvr_value		= 0x00087010,
+	{	/* 750CL (and "Broadway") */
+		.pvr_mask		= 0xfffff000,
+		.pvr_value		= 0x00087000,
 		.cpu_name		= "750CL",
 		.cpu_features		= CPU_FTRS_750CL,
 		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,
@@ -666,19 +666,6 @@
 		.machine_check		= machine_check_generic,
 		.platform		= "ppc750",
 	},
-	{	/* 745/755 */
-		.pvr_mask		= 0xfffff000,
-		.pvr_value		= 0x00083000,
-		.cpu_name		= "745/755",
-		.cpu_features		= CPU_FTRS_750,
-		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,
-		.icache_bsize		= 32,
-		.dcache_bsize		= 32,
-		.num_pmcs		= 4,
-		.cpu_setup		= __setup_cpu_750,
-		.machine_check		= machine_check_generic,
-		.platform		= "ppc750",
-	},
 	{	/* 750FX rev 1.x */
 		.pvr_mask		= 0xffffff00,
 		.pvr_value		= 0x70000100,