r2080 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches

[Sven Luther]

Author: luther
Date: 2004-12-27 20:56:19 -0700 (Mon, 27 Dec 2004)
New Revision: 2080

Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-misc-powermac-fixes.dpatch
Log:
Added additional fix for Xserve G5 pmacs, should fix #276397,


Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-12-28 02:41:04 UTC (rev 2079)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-12-28 03:56:19 UTC (rev 2080)
@@ -64,7 +64,7 @@
     - 970FX cpu support
     - G5 thermal management update
     - Misc powermac fixes backports
-    (Closes: #287030) (Sven Luther)
+    (Closes: #287030, #276397) (Sven Luther)
 
   * [powerpc] Moved from powerpc kernel-patch package :
     - powermac legacy serial fix.
@@ -79,12 +79,12 @@
     - A lot of warning fixes for RTC/__exit/serial code.
     - Fix cg6 framebuffer initialization.
     - fix up VM fault code handling
-  
+
   * Also a fix from David S. Miller which reverts ELF_ET_DYN_BASE setting,
     which was was put in place to make an obscure corner case work.
     closes: #287287
 
- -- Joshua Kwan <joshk@triplehelix.org>  Sun, 26 Dec 2004 11:39:11 -0800
+ -- Sven Luther <luther@debian.org>  Tue, 28 Dec 2004 04:51:46 +0100
 
 kernel-source-2.6.8 (2.6.8-10) unstable; urgency=high
 

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-misc-powermac-fixes.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-misc-powermac-fixes.dpatch	2004-12-28 02:41:04 UTC (rev 2079)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-misc-powermac-fixes.dpatch	2004-12-28 03:56:19 UTC (rev 2080)
@@ -8,10 +8,9 @@
 . $(dirname $0)/DPATCH
 
 @DPATCH@
-
-diff -urN debian-kernel-2.6.8/arch/ppc/kernel/pci.c debian-kernel-2.6.8-patched/arch/ppc/kernel/pci.c
---- debian-kernel-2.6.8/arch/ppc/kernel/pci.c	2004-08-14 07:36:57.000000000 +0200
-+++ debian-kernel-2.6.8-patched/arch/ppc/kernel/pci.c	2004-12-24 11:02:28.000000000 +0100
+diff -urN kernel-source-2.6.8.orig/arch/ppc/kernel/pci.c kernel-source-2.6.8/arch/ppc/kernel/pci.c
+--- kernel-source-2.6.8.orig/arch/ppc/kernel/pci.c	2004-08-14 07:36:57.000000000 +0200
++++ kernel-source-2.6.8/arch/ppc/kernel/pci.c	2004-12-28 04:39:16.543300968 +0100
 @@ -33,6 +33,7 @@
  unsigned long isa_io_base     = 0;
  unsigned long isa_mem_base    = 0;
@@ -29,10 +28,10 @@
  	}
  	pci_bus_count = next_busno;
  
-diff -urN debian-kernel-2.6.8/arch/ppc/platforms/pmac_feature.c debian-kernel-2.6.8-patched/arch/ppc/platforms/pmac_feature.c
---- debian-kernel-2.6.8/arch/ppc/platforms/pmac_feature.c	2004-08-14 07:37:41.000000000 +0200
-+++ debian-kernel-2.6.8-patched/arch/ppc/platforms/pmac_feature.c	2004-12-24 10:55:34.000000000 +0100
-@@ -2169,6 +2169,10 @@
+diff -urN kernel-source-2.6.8.orig/arch/ppc/platforms/pmac_feature.c kernel-source-2.6.8/arch/ppc/platforms/pmac_feature.c
+--- kernel-source-2.6.8.orig/arch/ppc/platforms/pmac_feature.c	2004-08-14 07:37:41.000000000 +0200
++++ kernel-source-2.6.8/arch/ppc/platforms/pmac_feature.c	2004-12-28 04:41:06.253622464 +0100
+@@ -2169,6 +2169,14 @@
  		PMAC_TYPE_POWERMAC_G5,		g5_features,
  		0,
  	},
@@ -40,10 +39,14 @@
 +		PMAC_TYPE_POWERMAC_G5,		g5_features,
 +		0,
 +	},
++	{	"RackMac3,1",			"XServe G5",
++		PMAC_TYPE_POWERMAC_G5,		g5_features,
++		0,
++	},
  #endif /* CONFIG_POWER4 */
  };
  
-@@ -2665,7 +2669,7 @@
+@@ -2665,7 +2673,7 @@
  			struct device_node *p = of_get_parent(ui2c);
  			if (p && !strcmp(p->name, "uni-n"))
  				break;
@@ -52,9 +55,9 @@
  		}
  		if (ui2c == NULL)
  			break;
-diff -urN debian-kernel-2.6.8/arch/ppc/platforms/pmac_pci.c debian-kernel-2.6.8-patched/arch/ppc/platforms/pmac_pci.c
---- debian-kernel-2.6.8/arch/ppc/platforms/pmac_pci.c	2004-08-14 07:36:58.000000000 +0200
-+++ debian-kernel-2.6.8-patched/arch/ppc/platforms/pmac_pci.c	2004-12-24 10:51:06.000000000 +0100
+diff -urN kernel-source-2.6.8.orig/arch/ppc/platforms/pmac_pci.c kernel-source-2.6.8/arch/ppc/platforms/pmac_pci.c
+--- kernel-source-2.6.8.orig/arch/ppc/platforms/pmac_pci.c	2004-08-14 07:36:58.000000000 +0200
++++ kernel-source-2.6.8/arch/ppc/platforms/pmac_pci.c	2004-12-28 04:39:16.756268592 +0100
 @@ -50,6 +50,7 @@
  #endif /* CONFIG_POWER4 */