r2070 - trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches

[Sven Luther]

Author: luther
Date: 2004-12-27 04:23:46 -0700 (Mon, 27 Dec 2004)
New Revision: 2070

Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-970fx-support.dpatch
Log:
Modified some comments in the powerpc-970fx-support for better accuracy.


Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-970fx-support.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-970fx-support.dpatch	2004-12-27 07:52:38 UTC (rev 2069)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-970fx-support.dpatch	2004-12-27 11:23:46 UTC (rev 2070)
@@ -8,12 +8,14 @@
 . $(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 */
+--- kernel-source-2.6.8-2.6.8/arch/ppc/kernel/cpu_setup_power4.S	2004-08-13 22:37:37.000000000 -0700
++++ kernel-source-2.6.8-custom.1.0/arch/ppc/kernel/cpu_setup_power4.S	2004-12-26 17:33:16.341931632 -0800
+@@ -109,10 +109,12 @@
+ 	lis	r5,cpu_state_storage@h
+ 	ori	r5,r5,cpu_state_storage@l
+ 
+-	/* We only deal with 970 for now */
++	/* Deal with both 970 and 970FX */
  	mfspr	r0,SPRN_PVR
  	srwi	r0,r0,16
 -	cmpwi	r0,0x39
@@ -23,8 +25,12 @@
  	bne	1f
  
  	/* Save HID0,1,4 and 5 */
-@@ -144,7 +146,9 @@
- 	/* We only deal with 970 for now */
+@@ -141,10 +143,12 @@
+ 	lis	r5,(cpu_state_storage-KERNELBASE)@h
+ 	ori	r5,r5,cpu_state_storage@l
+ 
+-	/* We only deal with 970 for now */
++	/* Deal with both 970 and 970FX */
  	mfspr	r0,SPRN_PVR
  	srwi	r0,r0,16
 -	cmpwi	r0,0x39
@@ -34,10 +40,9 @@
  	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
-@@ -450,6 +450,15 @@
+--- kernel-source-2.6.8-2.6.8/arch/ppc/kernel/cputable.c	2004-08-13 22:36:58.000000000 -0700
++++ kernel-source-2.6.8-custom.1.0/arch/ppc/kernel/cputable.c	2004-12-26 17:29:20.956715624 -0800
+@@ -445,6 +445,15 @@
  	128, 128,
  	__setup_cpu_ppc970
      },