r1073 - trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches

[Simon Horman]

Author: horms
Date: 2004-08-13 23:39:08 -0600 (Fri, 13 Aug 2004)
New Revision: 1073

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6
Log:
fix compile probem on gcc 2.95 - introduced by CAN-2004-0415 fix

Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6	2004-08-14 04:55:37 UTC (rev 1072)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6	2004-08-14 05:39:08 UTC (rev 1073)
@@ -284,6 +284,7 @@
 #   2004/07/30 10:29:39-03:00 marcelo@logos.cnet +4 -2
 #   Import patch 2.4.27-ppos5.patch
 # *** Updated patch to include ChangeSet 1.1469 - Horms 2004/08/12 ***
+# *** Updated patch to include ChangeSet 1.1458.1.11 - Horms 2004/08/14 ***
 # 
 # net/atm/mpoa_proc.c
 #   2004/07/30 10:29:39-03:00 marcelo@logos.cnet +4 -3
@@ -4658,11 +4659,12 @@
 diff -Nru a/net/atm/br2684.c b/net/atm/br2684.c
 --- a/net/atm/br2684.c	2004-08-11 19:29:57 -07:00
 +++ b/net/atm/br2684.c	2004-08-11 19:29:57 -07:00
-@@ -737,6 +737,7 @@
+@@ -737,6 +737,8 @@
  	unsigned long page;
  	int len = 0, x, left;
++	loff_t n = *pos;
++
  	page = get_free_page(GFP_KERNEL);
-+	loff_t n = *pos;
  	if (!page)
  		return -ENOMEM;
  	left = PAGE_SIZE - 256;
@@ -4764,6 +4766,21 @@
 # *** Incorporated into patch for ChangeSet 1.1465 above - Horms 2004/08/12 ***
 # 
 
+#ChangeSet1.1458.1.11
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2004/08/04 16:16:57-03:00 geert@linux-m68k.org 
+#   [PATCH] Fix net/atm/br2684.c file offset patch
+#   
+#   Breaks the build with gcc 2.95. Trivial fix below:
+# 
+# net/atm/br2684.c
+#   2004/08/04 12:21:16-03:00 geert@linux-m68k.org +2 -1
+#   Fix net/atm/br2684.c file offset patch
+# *** Incorporated into patch for ChangeSet 1.1465 above - Horms 2004/08/14 ***
+# 
+
 # Reverse bogus patch
 # Horms 2004/08/12