aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Langasek <vorlon@debian.org>2006-02-08 07:24:17 +0100
committerChris Wright <chrisw@sous-sol.org>2006-02-09 23:20:17 -0800
commitc93e834ed994db3290c88391af4c2eea5e3f5f1e (patch)
tree8b2891ccd71cc269e40bd0dacfea0f72ed95ef8f
parent1ac4ddd4f263ae2f9297381b6c1dea882225e33f (diff)
downloadlinux-linaro-stable-c93e834ed994db3290c88391af4c2eea5e3f5f1e.tar.gz
[PATCH] __cmpxchg() must really always be inlined
With the latest 2.6.15 kernel builds for alpha on Debian, we ran into a problem with undefined references to __cmpxchg_called_with_bad_pointer() in a couple of kernel modules (xfs.ko and drm.ko; see http://bugs.debian.org/347556). It looks like people have been trying to out-clever each other wrt the definition of "inline" on this architecture :), with the result that __cmpxchg(), which must be inlined so the compiler can see its argument is const, is not guaranteed to be inlined. Indeed, it was not being inlined when building with -Os. The attached patch fixes the issue by adding an __attribute__((always_inline)) explicitly to the definition of __cmpxchg() instead of relying on redefines of "inline" elsewhere to make this happen. Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Chris Wright <chrisw@sous-sol.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--include/asm-alpha/system.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-alpha/system.h b/include/asm-alpha/system.h
index 050e86d12891..1f75e4de5db3 100644
--- a/include/asm-alpha/system.h
+++ b/include/asm-alpha/system.h
@@ -562,7 +562,7 @@ __cmpxchg_u64(volatile long *m, unsigned long old, unsigned long new)
if something tries to do an invalid cmpxchg(). */
extern void __cmpxchg_called_with_bad_pointer(void);
-static inline unsigned long
+static __always_inline unsigned long
__cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
{
switch (size) {