r2185 - trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches

[Andres Salomon]

Author: dilinger-guest
Date: 2005-01-08 10:59:13 +0100 (Sat, 08 Jan 2005)
New Revision: 2185

Modified:
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/powerpc-970fx-support.dpatch
Log:
This patch is already partially merged into 2.6.9


Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/powerpc-970fx-support.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/powerpc-970fx-support.dpatch	2005-01-08 09:48:00 UTC (rev 2184)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/powerpc-970fx-support.dpatch	2005-01-08 09:59:13 UTC (rev 2185)
@@ -8,32 +8,6 @@
 . $(dirname $0)/DPATCH
 
 @DPATCH@
-diff -ur kernel-source-2.6.7.orig/arch/ppc/platforms/chrp_pci.c kernel-source-2.6.7.peg2/arch/ppc/platforms/chrp_pci.c
-diff -urN debian-kernel-2.6.8/arch/ppc/kernel/cpu_setup_power4.S debian-kernel-2.6.8-patched/arch/ppc/kernel/cpu_setup_power4.S
---- debian-kernel-2.6.8/arch/ppc/kernel/cpu_setup_power4.S	2004-08-14 07:37:37.000000000 +0200
-+++ debian-kernel-2.6.8-patched/arch/ppc/kernel/cpu_setup_power4.S	2004-12-24 10:47:29.000000000 +0100
-@@ -112,7 +112,9 @@
- 	/* We only deal with 970 for now */
- 	mfspr	r0,SPRN_PVR
- 	srwi	r0,r0,16
--	cmpwi	r0,0x39
-+	cmpwi	cr0,r0,0x39
-+	cmpwi	cr1,r0,0x3c
-+	cror	4*cr0+eq,4*cr0+eq,4*cr1+eq
- 	bne	1f
- 
- 	/* Save HID0,1,4 and 5 */
-@@ -144,7 +146,9 @@
- 	/* We only deal with 970 for now */
- 	mfspr	r0,SPRN_PVR
- 	srwi	r0,r0,16
--	cmpwi	r0,0x39
-+	cmpwi	cr0,r0,0x39
-+	cmpwi	cr1,r0,0x3c
-+	cror	4*cr0+eq,4*cr0+eq,4*cr1+eq
- 	bne	1f
- 
- 	/* Clear interrupt prefix */
 diff -urN debian-kernel-2.6.8/arch/ppc/kernel/cputable.c debian-kernel-2.6.8-patched/arch/ppc/kernel/cputable.c
 --- debian-kernel-2.6.8/arch/ppc/kernel/cputable.c	2004-11-24 22:47:25.000000000 +0100
 +++ debian-kernel-2.6.8-patched/arch/ppc/kernel/cputable.c	2004-12-24 10:48:47.000000000 +0100