[kernel] r7412 - 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: Thu Sep 14 03:35:02 2006
New Revision: 7412

Added:
   dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/232_sparc-membar-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:
* 232_sparc-membar-extraneous-semicolons.diff
  Fix an additional syntax error caused by extraneous semicolons
  in membar macros on sparc

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	Thu Sep 14 03:35:02 2006
@@ -34,8 +34,11 @@
   * 231_udf-deadlock.diff
     [SECURITY] Fix possible UDF deadlock and memory corruption
     See CVE-2006-4145
+  * 232_sparc-membar-extraneous-semicolons.diff
+    Fix an additional syntax error caused by extraneous semicolons
+    in membar macros on sparc
 
- -- dann frazier <dannf at debian.org>  Mon,  4 Sep 2006 23:53:53 -0600
+ -- dann frazier <dannf at debian.org>  Wed, 13 Sep 2006 21:33:51 -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/232_sparc-membar-extraneous-semicolons.diff
==============================================================================
--- (empty file)
+++ dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/232_sparc-membar-extraneous-semicolons.diff	Thu Sep 14 03:35:02 2006
@@ -0,0 +1,27 @@
+diff -Naru a/include/asm-sparc64/system.h b/include/asm-sparc64/system.h
+--- a/include/asm-sparc64/system.h	2006-09-14 04:41:50 -07:00
++++ b/include/asm-sparc64/system.h	2006-09-14 04:41:50 -07:00
+@@ -106,9 +106,9 @@
+ 
+ #define nop() 		__asm__ __volatile__ ("nop")
+ 
+-#define membar(type)	__asm__ __volatile__ ("membar " type : : : "memory");
++#define membar(type)	__asm__ __volatile__ ("membar " type : : : "memory")
+ #define mb()		\
+-	membar("#LoadLoad | #LoadStore | #StoreStore | #StoreLoad");
++	membar("#LoadLoad | #LoadStore | #StoreStore | #StoreLoad")
+ #define rmb()		membar("#LoadLoad")
+ #define wmb()		membar("#StoreStore")
+ #define set_mb(__var, __value) \
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2005/02/14 09:01:06-08:00 davem at nuts.davemloft.net 
+#   [SPARC64]: Fix trailing semicolon in membar macros.
+#   
+#   Signed-off-by: David S. Miller <davem at davemloft.net>
+# 
+# include/asm-sparc64/system.h
+#   2005/02/14 09:00:47-08:00 davem at nuts.davemloft.net +2 -2
+#   [SPARC64]: Fix trailing semicolon in membar 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	Thu Sep 14 03:35:02 2006
@@ -7,3 +7,4 @@
 + 229_sctp-priv-elevation.diff
 + 230_sctp-priv-elevation-2.diff
 + 231_udf-deadlock.diff
++ 232_sparc-membar-extraneous-semicolons.diff