* Re: 2.6.18-rc5-git3 build error on i386 - include/asm/spinlock.h
2006-08-31 8:15 2.6.18-rc5-git3 build error on i386 - include/asm/spinlock.h Jesper Juhl
@ 2006-08-31 9:43 ` Rolf Eike Beer
2006-08-31 9:52 ` Jesper Juhl
2006-08-31 17:53 ` Linus Torvalds
1 sibling, 1 reply; 4+ messages in thread
From: Rolf Eike Beer @ 2006-08-31 9:43 UTC (permalink / raw)
To: Jesper Juhl
Cc: Linux Kernel Mailing List, Benjamin LaHaise, Linus Torvalds,
Andi Kleen, Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 1379 bytes --]
Jesper Juhl wrote:
> 2.6.18-rc5-git2 builds just fine, but with -git3 I get the following :
>
> CHK include/linux/version.h
> CHK include/linux/utsrelease.h
> CC arch/i386/kernel/asm-offsets.s
> In file included from include/linux/spinlock.h:86,
> from include/linux/capability.h:45,
> from include/linux/sched.h:44,
> from include/linux/module.h:9,
> from include/linux/crypto.h:20,
> from arch/i386/kernel/asm-offsets.c:7:
> include/asm/spinlock.h: In function `__raw_read_lock':
> include/asm/spinlock.h:164: error: syntax error before ')' token
> include/asm/spinlock.h: In function `__raw_write_lock':
> include/asm/spinlock.h:169: error: called object is not a function
> include/asm/spinlock.h:169: warning: left-hand operand of comma
> expression has no effect
> include/asm/spinlock.h:169: warning: left-hand operand of comma
> expression has no effect
> include/asm/spinlock.h:169: error: syntax error before ')' token
> make[1]: *** [arch/i386/kernel/asm-offsets.s] Error 1
> make: *** [prepare0] Error 2
>
> Let me know if there's any additional info you need or patches you
> want me to test.
revert commit 8c74932779fc6f61b4c30145863a17125c1a296c
Author: Andi Kleen <ak@suse.de> Wed, 30 Aug 2006 19:37:14 +0200
[PATCH] i386: Remove alternative_smp
Eike
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: 2.6.18-rc5-git3 build error on i386 - include/asm/spinlock.h
2006-08-31 8:15 2.6.18-rc5-git3 build error on i386 - include/asm/spinlock.h Jesper Juhl
2006-08-31 9:43 ` Rolf Eike Beer
@ 2006-08-31 17:53 ` Linus Torvalds
1 sibling, 0 replies; 4+ messages in thread
From: Linus Torvalds @ 2006-08-31 17:53 UTC (permalink / raw)
To: Jesper Juhl; +Cc: Linux Kernel Mailing List, Benjamin LaHaise, Andrew Morton
On Thu, 31 Aug 2006, Jesper Juhl wrote:
>
> 2.6.18-rc5-git2 builds just fine, but with -git3 I get the following :
Yes, it was broken by a recent patch by Andi. It should be ok again now in
my git tree.
For non-git users, here's the patch that should matter.
Linus
----
commit 22db37ec5fd51b0c77b1dd5751b1cdc2672c08d6
Author: Chris Wright <chrisw@sous-sol.org>
Date: Thu Aug 31 00:53:22 2006 -0700
[PATCH] i386: rwlock.h fix smp alternatives fix
Commit 8c74932779fc6f61b4c30145863a17125c1a296c ("i386: Remove
alternative_smp") did not actually compile on x86 with CONFIG_SMP.
This fixes the __build_read/write_lock helpers. I've boot tested on
SMP.
[ Andi: "Oops, I think that was a quilt unrefreshed patch. Sorry. I
fixed those before testing, but then still send out the old patch." ]
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Cc: Gerd Hoffmann <kraxel@suse.de>
Acked-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
diff --git a/include/asm-i386/rwlock.h b/include/asm-i386/rwlock.h
index 3ac1ba9..87c069c 100644
--- a/include/asm-i386/rwlock.h
+++ b/include/asm-i386/rwlock.h
@@ -21,21 +21,21 @@ #define RW_LOCK_BIAS 0x01000000
#define RW_LOCK_BIAS_STR "0x01000000"
#define __build_read_lock_ptr(rw, helper) \
- asm volatile(LOCK_PREFIX " ; subl $1,(%0)\n\t" \
+ asm volatile(LOCK_PREFIX " subl $1,(%0)\n\t" \
"jns 1f\n" \
"call " helper "\n\t" \
"1:\n" \
- :"a" (rw) : "memory")
+ ::"a" (rw) : "memory")
#define __build_read_lock_const(rw, helper) \
- asm volatile(LOCK_PREFIX " ; subl $1,%0\n\t" \
+ asm volatile(LOCK_PREFIX " subl $1,%0\n\t" \
"jns 1f\n" \
"pushl %%eax\n\t" \
"leal %0,%%eax\n\t" \
"call " helper "\n\t" \
"popl %%eax\n\t" \
- "1:\n" : \
- "+m" (*(volatile int *)rw) : : "memory")
+ "1:\n" \
+ :"+m" (*(volatile int *)rw) : : "memory")
#define __build_read_lock(rw, helper) do { \
if (__builtin_constant_p(rw)) \
@@ -45,23 +45,21 @@ #define __build_read_lock(rw, helper) do
} while (0)
#define __build_write_lock_ptr(rw, helper) \
- asm volatile(LOCK_PREFIX " ; subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \
+ asm volatile(LOCK_PREFIX " subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \
"jz 1f\n" \
"call " helper "\n\t" \
- "1:\n", \
- "subl $" RW_LOCK_BIAS_STR ",(%0)\n\t", \
- :"a" (rw) : "memory")
+ "1:\n" \
+ ::"a" (rw) : "memory")
#define __build_write_lock_const(rw, helper) \
- asm volatile(LOCK_PREFIX " ; subl $" RW_LOCK_BIAS_STR ",%0\n\t" \
+ asm volatile(LOCK_PREFIX " subl $" RW_LOCK_BIAS_STR ",%0\n\t" \
"jz 1f\n" \
"pushl %%eax\n\t" \
"leal %0,%%eax\n\t" \
"call " helper "\n\t" \
"popl %%eax\n\t" \
- "1:\n", \
- "subl $" RW_LOCK_BIAS_STR ",%0\n\t", \
- "+m" (*(volatile int *)rw) : : "memory")
+ "1:\n" \
+ :"+m" (*(volatile int *)rw) : : "memory")
#define __build_write_lock(rw, helper) do { \
if (__builtin_constant_p(rw)) \
^ permalink raw reply related [flat|nested] 4+ messages in thread