r1247 - in trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian: . patches

[Joshua Kwan]

Author: joshk
Date: 2004-08-18 21:24:55 -0600 (Wed, 18 Aug 2004)
New Revision: 1247

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog
   trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6
Log:
add gcc 3.3 compile fix

Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog	2004-08-19 03:19:23 UTC (rev 1246)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog	2004-08-19 03:24:55 UTC (rev 1247)
@@ -190,10 +190,11 @@
     and Joshua Kwan.
     N.B: This change requires CONFIG_FW_LOADER and in turn 
     CONFIG_EXPERIMENTAL to be enabled for the tg3 driver to be compiled.
-  * Merge in some trivial patches from kernel-image-sparc-2.4.
+  * Merge in some trivial patches from kernel-image-sparc-2.4, as well as
+    a fix that allows us to compile for sparc32 using gcc-3.3.
+ 
+ -- Joshua Kwan <joshk@triplehelix.org>  Wed, 18 Aug 2004 20:13:03 -0700
 
- -- Simon Horman <horms@debian.org>  Thu, 19 Aug 2004 12:11:45 +0900
-
 kernel-source-2.4.26 (2.4.26-5) unstable; urgency=high
 
   * Cleaned up after the previous upload.  In particular, patch-2.4.26-3

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-19 03:19:23 UTC (rev 1246)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6	2004-08-19 03:24:55 UTC (rev 1247)
@@ -19664,3 +19664,114 @@
  
 -EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
+
+# 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