r2500 - in trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian: . patches patches/series

[Jurij Smakov]

Author: jurij-guest
Date: 2005-02-17 08:19:19 +0100 (Thu, 17 Feb 2005)
New Revision: 2500

Added:
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/sparc32-hypersparc-srmmu.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-6
Log:
Add sparc32-hypersparc-srmmu.dpatch to 2.6.10-6


Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog	2005-02-17 01:52:39 UTC (rev 2499)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog	2005-02-17 07:19:19 UTC (rev 2500)
@@ -16,6 +16,9 @@
     that (as a side effect) caused NIS to flatten a sparc64 machine.
     closes: #295628 (Joshua Kwan)
 
+  * sparc32-hypersparc-srmmu.dpatch: unbreak hypersparc by reverting a
+    srmmu "fix", which should not have made it to 2.6.10 (Jurij Smakov) 
+
  -- Joshua Kwan <joshk@triplehelix.org>  Wed, 16 Feb 2005 17:51:30 -0800
 
 kernel-source-2.6.10 (2.6.10-5) unstable; urgency=low

Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-6
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-6	2005-02-17 01:52:39 UTC (rev 2499)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-6	2005-02-17 07:19:19 UTC (rev 2500)
@@ -1,3 +1,4 @@
 + atyfb-sparc.dpatch
 + skb-reset-ip_summed.dpatch
 + sparc64-nis-killer.dpatch
++ sparc32-hypersparc-srmmu.dpatch

Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/sparc32-hypersparc-srmmu.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/sparc32-hypersparc-srmmu.dpatch	2005-02-17 01:52:39 UTC (rev 2499)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/sparc32-hypersparc-srmmu.dpatch	2005-02-17 07:19:19 UTC (rev 2500)
@@ -0,0 +1,10 @@
+--- a/arch/sparc/mm/srmmu.c	2004-12-24 16:34:58.000000000 -0500
++++ b/arch/sparc/mm/srmmu.c	2005-02-17 02:03:31.000000000 -0500
+@@ -1463,7 +1463,6 @@
+ static void __init init_hypersparc(void)
+ {
+ 	srmmu_name = "ROSS HyperSparc";
+-	srmmu_modtype = HyperSparc;
+ 
+ 	init_vac_layout();
+