[kernel] r7319 - in dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches patches/series

[Dann Frazier]

Author: dannf
Date: Tue Sep  5 05:56:42 2006
New Revision: 7319

Added:
   dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/231_sparc-mb-extraneous-semicolons.diff
Modified:
   dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
   dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-10sarge4

Log:
* 231_sparc-mb-extraneous-semicolons.diff
  Fix a syntax error caused by extranous semicolons in smp_mb() macros
  which resulted in a build failure with 227_kfree_skb.diff

Modified: dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
==============================================================================
--- dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	(original)
+++ dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	Tue Sep  5 05:56:42 2006
@@ -31,8 +31,11 @@
   * 229_udf-deadlock.diff
     [SECURITY] Fix possible UDF deadlock and memory corruption
     See CVE-2006-4145
+  * 231_sparc-mb-extraneous-semicolons.diff
+    Fix a syntax error caused by extranous semicolons in smp_mb() macros
+    which resulted in a build failure with 227_kfree_skb.diff
 
- -- dann frazier <dannf at debian.org>  Mon, 28 Aug 2006 23:16:42 -0600
+ -- dann frazier <dannf at debian.org>  Mon,  4 Sep 2006 23:53:53 -0600
 
 kernel-source-2.4.27 (2.4.27-10sarge3) stable-security; urgency=high
 

Added: dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/231_sparc-mb-extraneous-semicolons.diff
==============================================================================
--- (empty file)
+++ dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/231_sparc-mb-extraneous-semicolons.diff	Tue Sep  5 05:56:42 2006
@@ -0,0 +1,50 @@
+diff -Naru a/include/asm-sparc/system.h b/include/asm-sparc/system.h
+--- a/include/asm-sparc/system.h	2006-09-05 07:01:03 -07:00
++++ b/include/asm-sparc/system.h	2006-09-05 07:01:03 -07:00
+@@ -295,9 +295,9 @@
+ #define wmb()	mb()
+ #define set_mb(__var, __value)  do { __var = __value; mb(); } while(0)
+ #define set_wmb(__var, __value) set_mb(__var, __value)
+-#define smp_mb()	__asm__ __volatile__("":::"memory");
+-#define smp_rmb()	__asm__ __volatile__("":::"memory");
+-#define smp_wmb()	__asm__ __volatile__("":::"memory");
++#define smp_mb()	__asm__ __volatile__("":::"memory")
++#define smp_rmb()	__asm__ __volatile__("":::"memory")
++#define smp_wmb()	__asm__ __volatile__("":::"memory")
+ 
+ #define nop() __asm__ __volatile__ ("nop");
+ 
+diff -Naru a/include/asm-sparc64/system.h b/include/asm-sparc64/system.h
+--- a/include/asm-sparc64/system.h	2006-09-05 07:01:03 -07:00
++++ b/include/asm-sparc64/system.h	2006-09-05 07:01:03 -07:00
+@@ -121,9 +121,9 @@
+ #define smp_rmb()	rmb()
+ #define smp_wmb()	wmb()
+ #else
+-#define smp_mb()	__asm__ __volatile__("":::"memory");
+-#define smp_rmb()	__asm__ __volatile__("":::"memory");
+-#define smp_wmb()	__asm__ __volatile__("":::"memory");
++#define smp_mb()	__asm__ __volatile__("":::"memory")
++#define smp_rmb()	__asm__ __volatile__("":::"memory")
++#define smp_wmb()	__asm__ __volatile__("":::"memory")
+ #endif
+ 
+ #define flushi(addr)	__asm__ __volatile__ ("flush %0" : : "r" (addr) : "memory")
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2005/02/10 17:29:09-08:00 davem at nuts.davemloft.net 
+#   [SPARC]: Fix bogus trailing semicolon in smb_*() macros.
+#   
+#   Backported from 2.6.x
+#   
+#   Signed-off-by: David S. Miller <davem at davemloft.net>
+# 
+# include/asm-sparc/system.h
+#   2005/02/10 17:28:48-08:00 davem at nuts.davemloft.net +3 -3
+#   [SPARC]: Fix bogus trailing semicolon in smb_*() macros.
+# 
+# include/asm-sparc64/system.h
+#   2005/02/10 17:28:48-08:00 davem at nuts.davemloft.net +3 -3
+#   [SPARC]: Fix bogus trailing semicolon in smb_*() macros.
+# 

Modified: dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-10sarge4
==============================================================================
--- dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-10sarge4	(original)
+++ dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-10sarge4	Tue Sep  5 05:56:42 2006
@@ -6,3 +6,4 @@
 + 228_sctp-priv-elevation.diff
 + 229_udf-deadlock.diff
 + 230_sctp-priv-elevation-2.diff
++ 231_sparc-mb-extraneous-semicolons.diff