* Re: [2.6 PATCH] syntax errors by smp_{mb,rmb,wmb} on sparc32
2005-02-10 7:19 [2.6 PATCH] syntax errors by smp_{mb,rmb,wmb} on sparc32 Meelis Roos
@ 2005-02-10 8:23 ` David S. Miller
2005-02-10 9:41 ` William Lee Irwin III
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: David S. Miller @ 2005-02-10 8:23 UTC (permalink / raw)
To: sparclinux
On Thu, 10 Feb 2005 09:19:28 +0200 (EET)
Meelis Roos <mroos@linux.ee> wrote:
> 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.
>
> Signed-off-by: Meelis Roos <mroos@linux.ee>
Sorry, I should have checked this out when I fixed the same exact
bug on sparc64.
I'll apply and push upstream, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [2.6 PATCH] syntax errors by smp_{mb,rmb,wmb} on sparc32
2005-02-10 7:19 [2.6 PATCH] syntax errors by smp_{mb,rmb,wmb} on sparc32 Meelis Roos
2005-02-10 8:23 ` David S. Miller
@ 2005-02-10 9:41 ` William Lee Irwin III
2005-02-10 19:42 ` William Lee Irwin III
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: William Lee Irwin III @ 2005-02-10 9:41 UTC (permalink / raw)
To: sparclinux
On Thu, 10 Feb 2005 09:19:28 +0200 (EET) Meelis Roos <mroos@linux.ee> wrote:
>> 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.
>> Signed-off-by: Meelis Roos <mroos@linux.ee>
On Thu, Feb 10, 2005 at 12:23:41AM -0800, David S. Miller wrote:
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [2.6 PATCH] syntax errors by smp_{mb,rmb,wmb} on sparc32
2005-02-10 7:19 [2.6 PATCH] syntax errors by smp_{mb,rmb,wmb} on sparc32 Meelis Roos
2005-02-10 8:23 ` David S. Miller
2005-02-10 9:41 ` William Lee Irwin III
@ 2005-02-10 19:42 ` William Lee Irwin III
2005-02-11 3:05 ` Bob Breuer
2005-02-11 3:31 ` David S. Miller
4 siblings, 0 replies; 6+ messages in thread
From: William Lee Irwin III @ 2005-02-10 19:42 UTC (permalink / raw)
To: sparclinux
On Thu, 10 Feb 2005 09:19:28 +0200 (EET) Meelis Roos <mroos@linux.ee> wrote:
>>> 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.
>>> Signed-off-by: Meelis Roos <mroos@linux.ee>
On Thu, Feb 10, 2005 at 12:23:41AM -0800, David S. Miller wrote:
>> Sorry, I should have checked this out when I fixed the same exact
> bug on sparc64.
>> I'll apply and push upstream, thanks.
On Thu, Feb 10, 2005 at 01:41:10AM -0800, William Lee Irwin III wrote:
> 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.
Acked-by: William Irwin <wli@holomorphy.com>
-- 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.
Signed-off-by: Meelis Roos <mroos@linux.ee>
=== 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");
--
Meelis Roos (mroos@linux.ee)
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [2.6 PATCH] syntax errors by smp_{mb,rmb,wmb} on sparc32
2005-02-10 7:19 [2.6 PATCH] syntax errors by smp_{mb,rmb,wmb} on sparc32 Meelis Roos
` (2 preceding siblings ...)
2005-02-10 19:42 ` William Lee Irwin III
@ 2005-02-11 3:05 ` Bob Breuer
2005-02-11 3:31 ` David S. Miller
4 siblings, 0 replies; 6+ messages in thread
From: Bob Breuer @ 2005-02-11 3:05 UTC (permalink / raw)
To: sparclinux
William Lee Irwin III wrote:
>
> #define nop() __asm__ __volatile__ ("nop");
^^^
Looks like the nop macro needs to have it's semicolon taken away also.
Bob
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [2.6 PATCH] syntax errors by smp_{mb,rmb,wmb} on sparc32
2005-02-10 7:19 [2.6 PATCH] syntax errors by smp_{mb,rmb,wmb} on sparc32 Meelis Roos
` (3 preceding siblings ...)
2005-02-11 3:05 ` Bob Breuer
@ 2005-02-11 3:31 ` David S. Miller
4 siblings, 0 replies; 6+ messages in thread
From: David S. Miller @ 2005-02-11 3:31 UTC (permalink / raw)
To: sparclinux
On Thu, 10 Feb 2005 21:05:29 -0600
Bob Breuer <breuerr@mc.net> wrote:
> William Lee Irwin III wrote:
> >
> > #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).
^ permalink raw reply [flat|nested] 6+ messages in thread