r1410 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series

[luther@haydn.debian.org]

Author: luther
Date: 2004-08-27 16:30:39 -0600 (Fri, 27 Aug 2004)
New Revision: 1410

Removed:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-g4-errata-2.dpatch
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/series/2.6.8-5
Log:
Backed out unessecary patch again.


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-08-27 22:25:13 UTC (rev 1409)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-27 22:30:39 UTC (rev 1410)
@@ -1,8 +1,5 @@
 kernel-source-2.6.8 (2.6.8-5) UNRELEASED; urgency=high
 
-  * Fixed g4-errata BTIC patch to really clear the BTIC bit, and not just
-    toggle it. (Sven Luther)
-
   * Patches by the infintely wise and awesome David S. Miller:
     - sparc64-sunsab-fix.dpatch: Fix the infamous serial output
       bug causing every other character in kernel messages to be omitted.

Deleted: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-g4-errata-2.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-g4-errata-2.dpatch	2004-08-27 22:25:13 UTC (rev 1409)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-g4-errata-2.dpatch	2004-08-27 22:30:39 UTC (rev 1410)
@@ -1,27 +0,0 @@
-#! /bin/sh -e 
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: Clears the BTIC bit if it was previously set by the firmware, but is broken in the CPUs.
-## DP: Patch author: Sven Luther <luther@debian.org>
-## DP: Upstream status: reviewed and submited by benh
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
---- kernel-source-2.6.8.orig/arch/ppc/kernel/cpu_setup_6xx.S	2004-08-14 07:36:18.000000000 +0200
-+++ kernel-source-2.6.8/arch/ppc/kernel/cpu_setup_6xx.S	2004-08-26 11:24:12.970564536 +0200
-@@ -218,10 +218,11 @@
- 
- 	/* All of the bits we have to set.....
- 	 */
--	ori	r11,r11,HID0_SGE | HID0_FOLD | HID0_BHTE | HID0_LRSTK
-+	ori	r11,r11,HID0_SGE | HID0_FOLD | HID0_BHTE | HID0_BTIC | HID0_LRSTK
- BEGIN_FTR_SECTION
--	ori	r11,r11,HID0_BTIC
--END_FTR_SECTION_IFCLR(CPU_FTR_NO_BTIC)
-+	li	r3,HID0_BTIC
-+	andc	r11,r11,r3
-+END_FTR_SECTION_IFSET(CPU_FTR_NO_BTIC)
- BEGIN_FTR_SECTION
- 	oris	r11,r11,HID0_DPM@h	/* enable dynamic power mgmt */
- END_FTR_SECTION_IFCLR(CPU_FTR_NO_DPM)

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-5
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-5	2004-08-27 22:25:13 UTC (rev 1409)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-5	2004-08-27 22:30:39 UTC (rev 1410)
@@ -2,5 +2,3 @@
 + sparc64-syslog-register.dpatch
 + sparc32-export-more-ksyms.dpatch
 - modular-xfrm_tunnel.dpatch
-- powerpc-g4-errata.dpatch
-+ powerpc-g4-errata-2.dpatch