r1251 - in trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches patches/series
Joshua Kwan
joshk@haydn.debian.org
Thu, 19 Aug 2004 00:11:36 -0600
Author: joshk
Date: 2004-08-19 00:11:20 -0600 (Thu, 19 Aug 2004)
New Revision: 1251
Added:
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/065_copy_user_parens.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/066_dep_fw_loader.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/067_tg3_ampersand.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-4
Modified:
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
Log:
three patches of doom
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog 2004-08-19 06:09:17 UTC (rev 1250)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog 2004-08-19 06:11:20 UTC (rev 1251)
@@ -1,3 +1,14 @@
+kernel-source-2.4.27 (2.4.27-4) UNRELEASED; urgency=low
+
+ * 065_copy_user_parens.diff: This patch is cset 1.1447.4.7 from linux-2.4,
+ allowing us to build using binutils 2.15.
+ * 066_dep_fw_loader.diff: Prevent TIGON3 and PCMCIA_ATMEL from being
+ enabled if FW_LOADER is not selected.
+ * 067_tg3_ampersand.diff: Remove spurious & to tp->pdev, which caused a
+ warning in pci_name. May or may not have affected firmware loading.
+
+ -- Joshua Kwan <joshk@triplehelix.org> Wed, 18 Aug 2004 23:04:18 -0700
+
kernel-source-2.4.27 (2.4.27-3) unstable; urgency=high
* 018_core_cia_1G.diff: Backed out. Verified bogus.
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/065_copy_user_parens.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/065_copy_user_parens.diff 2004-08-19 06:09:17 UTC (rev 1250)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/065_copy_user_parens.diff 2004-08-19 06:11:20 UTC (rev 1251)
@@ -0,0 +1,110 @@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/07/21 13:42:33-07:00 tcallawa@redhat.com
+# [SPARC]: Fix copy_user.S with gcc 3.3
+#
+# Signed-off-by: Tom Callaway <tcallawa@redhat.com>
+# Signed-off-by: David S. Miller <davem@redhat.com>
+#
+# arch/sparc/lib/copy_user.S
+# 2004/07/21 13:42:25-07:00 tcallawa@redhat.com +38 -38
+# [SPARC]: Fix copy_user.S with gcc 3.3
+#
+# Signed-off-by: Tom Callaway <tcallawa@redhat.com>
+# Signed-off-by: David S. Miller <davem@redhat.com>
+#
+diff -Nru a/arch/sparc/lib/copy_user.S b/arch/sparc/lib/copy_user.S
+--- a/arch/sparc/lib/copy_user.S 2004-08-18 19:08:11 -07:00
++++ b/arch/sparc/lib/copy_user.S 2004-08-18 19:08:11 -07:00
+@@ -65,52 +65,52 @@
+
+ /* Both these macros have to start with exactly the same insn */
+ #define MOVE_BIGCHUNK(src, dst, offset, t0, t1, t2, t3, t4, t5, t6, t7) \
+- ldd [%src + offset + 0x00], %t0; \
+- ldd [%src + offset + 0x08], %t2; \
+- ldd [%src + offset + 0x10], %t4; \
+- ldd [%src + offset + 0x18], %t6; \
+- st %t0, [%dst + offset + 0x00]; \
+- st %t1, [%dst + offset + 0x04]; \
+- st %t2, [%dst + offset + 0x08]; \
+- st %t3, [%dst + offset + 0x0c]; \
+- st %t4, [%dst + offset + 0x10]; \
+- st %t5, [%dst + offset + 0x14]; \
+- st %t6, [%dst + offset + 0x18]; \
+- st %t7, [%dst + offset + 0x1c];
++ ldd [%src + (offset) + 0x00], %t0; \
++ ldd [%src + (offset) + 0x08], %t2; \
++ ldd [%src + (offset) + 0x10], %t4; \
++ ldd [%src + (offset) + 0x18], %t6; \
++ st %t0, [%dst + (offset) + 0x00]; \
++ st %t1, [%dst + (offset) + 0x04]; \
++ st %t2, [%dst + (offset) + 0x08]; \
++ st %t3, [%dst + (offset) + 0x0c]; \
++ st %t4, [%dst + (offset) + 0x10]; \
++ st %t5, [%dst + (offset) + 0x14]; \
++ st %t6, [%dst + (offset) + 0x18]; \
++ st %t7, [%dst + (offset) + 0x1c];
+
+ #define MOVE_BIGALIGNCHUNK(src, dst, offset, t0, t1, t2, t3, t4, t5, t6, t7) \
+- ldd [%src + offset + 0x00], %t0; \
+- ldd [%src + offset + 0x08], %t2; \
+- ldd [%src + offset + 0x10], %t4; \
+- ldd [%src + offset + 0x18], %t6; \
+- std %t0, [%dst + offset + 0x00]; \
+- std %t2, [%dst + offset + 0x08]; \
+- std %t4, [%dst + offset + 0x10]; \
+- std %t6, [%dst + offset + 0x18];
++ ldd [%src + (offset) + 0x00], %t0; \
++ ldd [%src + (offset) + 0x08], %t2; \
++ ldd [%src + (offset) + 0x10], %t4; \
++ ldd [%src + (offset) + 0x18], %t6; \
++ std %t0, [%dst + (offset) + 0x00]; \
++ std %t2, [%dst + (offset) + 0x08]; \
++ std %t4, [%dst + (offset) + 0x10]; \
++ std %t6, [%dst + (offset) + 0x18];
+
+ #define MOVE_LASTCHUNK(src, dst, offset, t0, t1, t2, t3) \
+- ldd [%src - offset - 0x10], %t0; \
+- ldd [%src - offset - 0x08], %t2; \
+- st %t0, [%dst - offset - 0x10]; \
+- st %t1, [%dst - offset - 0x0c]; \
+- st %t2, [%dst - offset - 0x08]; \
+- st %t3, [%dst - offset - 0x04];
++ ldd [%src - (offset) - 0x10], %t0; \
++ ldd [%src - (offset) - 0x08], %t2; \
++ st %t0, [%dst - (offset) - 0x10]; \
++ st %t1, [%dst - (offset) - 0x0c]; \
++ st %t2, [%dst - (offset) - 0x08]; \
++ st %t3, [%dst - (offset) - 0x04];
+
+ #define MOVE_HALFCHUNK(src, dst, offset, t0, t1, t2, t3) \
+- lduh [%src + offset + 0x00], %t0; \
+- lduh [%src + offset + 0x02], %t1; \
+- lduh [%src + offset + 0x04], %t2; \
+- lduh [%src + offset + 0x06], %t3; \
+- sth %t0, [%dst + offset + 0x00]; \
+- sth %t1, [%dst + offset + 0x02]; \
+- sth %t2, [%dst + offset + 0x04]; \
+- sth %t3, [%dst + offset + 0x06];
++ lduh [%src + (offset) + 0x00], %t0; \
++ lduh [%src + (offset) + 0x02], %t1; \
++ lduh [%src + (offset) + 0x04], %t2; \
++ lduh [%src + (offset) + 0x06], %t3; \
++ sth %t0, [%dst + (offset) + 0x00]; \
++ sth %t1, [%dst + (offset) + 0x02]; \
++ sth %t2, [%dst + (offset) + 0x04]; \
++ sth %t3, [%dst + (offset) + 0x06];
+
+ #define MOVE_SHORTCHUNK(src, dst, offset, t0, t1) \
+- ldub [%src - offset - 0x02], %t0; \
+- ldub [%src - offset - 0x01], %t1; \
+- stb %t0, [%dst - offset - 0x02]; \
+- stb %t1, [%dst - offset - 0x01];
++ ldub [%src - (offset) - 0x02], %t0; \
++ ldub [%src - (offset) - 0x01], %t1; \
++ stb %t0, [%dst - (offset) - 0x02]; \
++ stb %t1, [%dst - (offset) - 0x01];
+
+ .text
+ .align 4
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/066_dep_fw_loader.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/066_dep_fw_loader.diff 2004-08-19 06:09:17 UTC (rev 1250)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/066_dep_fw_loader.diff 2004-08-19 06:11:20 UTC (rev 1251)
@@ -0,0 +1,27 @@
+--- a/drivers/net/wireless/Config.in 2004-08-18 23:01:07.000000000 -0700
++++ b/drivers/net/wireless/Config.in 2004-08-18 23:03:35.000000000 -0700
+@@ -24,7 +24,9 @@
+
+ dep_tristate ' Hermes PCMCIA card support' CONFIG_PCMCIA_HERMES $CONFIG_HERMES
+ tristate ' Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards' CONFIG_AIRO_CS
+- dep_tristate ' Atmel at76c502/at76c504 PCMCIA cards' CONFIG_PCMCIA_ATMEL $CONFIG_FW_LOADER
++ if [ "$CONFIG_FW_LOADER" != "n" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then
++ dep_tristate ' Atmel at76c502/at76c504 PCMCIA cards' CONFIG_PCMCIA_ATMEL $CONFIG_FW_LOADER
++ fi
+ fi
+
+ # yes, this works even when no drivers are selected
+--- a/drivers/net/Config.in 2004-08-18 20:30:57.000000000 -0700
++++ b/drivers/net/Config.in 2004-08-18 23:03:18.000000000 -0700
+@@ -268,7 +268,10 @@
+ dep_tristate 'Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)' CONFIG_YELLOWFIN $CONFIG_PCI $CONFIG_EXPERIMENTAL
+ dep_tristate 'Realtek 8169 Gigabit Ethernet support' CONFIG_R8169 $CONFIG_PCI
+ dep_tristate 'Marvell Yukon Chipset / SysKonnect SK-98xx Support' CONFIG_SK98LIN $CONFIG_PCI
+-dep_tristate 'Broadcom Tigon3 support' CONFIG_TIGON3 $CONFIG_PCI
++
++if [ "$CONFIG_FW_LOADER" != "n" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then
++ dep_tristate 'Broadcom Tigon3 support' CONFIG_TIGON3 $CONFIG_PCI $CONFIG_FW_LOADER
++fi
+
+ if [ "$CONFIG_MOMENCO_OCELOT_C" = "y" -o "$CONFIG_MOMENCO_JAGUAR_ATX" = "y" ]; then
+ bool ' MV-64340 Ethernet support' CONFIG_MV64340_ETH
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/067_tg3_ampersand.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/067_tg3_ampersand.diff 2004-08-19 06:09:17 UTC (rev 1250)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/067_tg3_ampersand.diff 2004-08-19 06:11:20 UTC (rev 1251)
@@ -0,0 +1,11 @@
+--- a/drivers/net/tg3.c 2004-08-18 20:51:41.000000000 -0700
++++ b/drivers/net/tg3.c 2004-08-18 20:51:02.000000000 -0700
+@@ -3911,7 +3911,7 @@
+ if (*info_ptr)
+ return 0;
+
+- err = request_firmware(&fw_entry, filename, pci_name(&tp->pdev));
++ err = request_firmware(&fw_entry, filename, pci_name(tp->pdev));
+ if (err) {
+ printk(KERN_WARNING PFX "tg3_request_firmware (%s): "
+ "Couldn't get firmware \"%s\".\n",
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-4
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-4 2004-08-19 06:09:17 UTC (rev 1250)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-4 2004-08-19 06:11:20 UTC (rev 1251)
@@ -0,0 +1,3 @@
++ 065_copy_user_parens.diff
++ 066_dep_fw_loader.diff
++ 067_tg3_ampersand.diff