syntax errors by smp_{mb,rmb,wmb} on sparc32
PATCH 1/1 syntax errors by smp_{mb,rmb,wmb} on sparc32
smp_mb(), smp_rmp() and smp_wmb() definitions have a trailing semicolon and cause compilation errors in single statement context, like if-then-else on line 358 in include/linux/skbuff.h. This patch removes all three offending semicolons to make it compile.
=== include/asm/system.h 1.21 vs edited ==--- 1.21/include/asm-sparc/system.h 2004-07-05 13:33:38 +03:00
+++ edited/include/asm/system.h 2005-02-09 23:22:39 +02:00
@@ -195,9 +195,9 @@
#define read_barrier_depends() do { } while(0)
#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 smp_read_barrier_depends() do { } while(0)
#define nop() __asm__ __volatile__ ("nop");Signature · 1 line
Meelis Roos ([email protected])
Quoted 6 lines · On Thu, 10 Feb 2005 09:19:28 +0200 (EET) Meelis Roos <[email protected]> wrote:
smp_mb(),smp_rmp()andsmp_wmb()definitions have a trailing semicolon and cause compilation errors in single statement context, like if-then-else on line 358 ininclude/linux/skbuff.h. This patch removes all three offending semicolons to make it compile.Signed-off-by Meelis Roos <[email protected]>
Sorry, I should have checked this out when I fixed the same exact bug on sparc64.
I'll apply and push upstream, thanks.
Quoted 5 lines · On Thu, 10 Feb 2005 09:19:28 +0200 (EET) Meelis Roos <[email protected]> wrote:
Quoted 5 lines
smp_mb(),smp_rmp()andsmp_wmb()definitions have a trailing semicolon and cause compilation errors in single statement context, like if-then-else on line 358 ininclude/linux/skbuff.h. This patch removes all three offending semicolons to make it compile.Signed-off-by Meelis Roos <[email protected]>
Quoted 3 lines · David S. Miller
Sorry, I should have checked this out when I fixed the same exact bug on sparc64.
I'll apply and push upstream, thanks.
Sorry I didn't get around to this. Thanks for taking care of it.
-- wli
Quoted 5 lines · On Thu, 10 Feb 2005 09:19:28 +0200 (EET) Meelis Roos <[email protected]> wrote:
Quoted 5 lines
Quoted 5 lines
smp_mb(),smp_rmp()andsmp_wmb()definitions have a trailing semicolon and cause compilation errors in single statement context, like if-then-else on line 358 ininclude/linux/skbuff.h. This patch removes all three offending semicolons to make it compile.Signed-off-by Meelis Roos <[email protected]>
Quoted 3 lines · David S. Miller
Quoted 1 line
Sorry, I should have checked this out when I fixed the same exact
bug on sparc64.
Quoted 1 line
I'll apply and push upstream, thanks.
Quoted 1 line · William Lee Irwin III
Sorry I didn't get around to this. Thanks for taking care of it.
I regenerated the diff by hand because it didn't apply to bk for some reason, maybe mangled whitespace.
-- wli
smp_mb(), smp_rmp() and smp_wmb() definitions have a trailing semicolon and cause compilation errors in single statement context, like if-then-else on line 358 in include/linux/skbuff.h. This patch removes all three offending semicolons to make it compile.
=== include/asm-sparc/system.h 1.21 vs edited ==--- 1.21/include/asm-sparc/system.h Mon Jul 5 03:33:38 2004
+++ edited/include/asm-sparc/system.h Thu Feb 10 11:39:07 2005
@@ -195,9 +195,9 @@
#define read_barrier_depends() do { } while(0)
#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 smp_read_barrier_depends() do { } while(0)
#define nop() __asm__ __volatile__ ("nop");
Signature · 1 line
Meelis Roos ([email protected])
Quoted 2 lines · William Lee Irwin III
#define
nop()__asm____volatile__("nop");
^^^
Looks like the nop macro needs to have it's semicolon taken away also.
Bob
Quoted 5 lines · On Thu, 10 Feb 2005 21:05:29 -0600 Bob Breuer <[email protected]> wrote:
Quoted 2 lines · William Lee Irwin III
#define
nop()__asm____volatile__("nop");^^^Looks like the nop macro needs to have it's semicolon taken away also.
Good catch, I've fixed that in my tree(s).