summaryrefslogtreecommitdiff
path: root/include/asm-sparc/system.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-09 10:33:02 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-09 10:33:02 -0400
commit9dc263239bb2cfeb242d8ef758fca66a968822d5 (patch)
tree70c0c46fa6f01740c776ae24bc0874a8d97df222 /include/asm-sparc/system.h
parent0e5dec478cfff2c29e68d1108ff828fa321adc59 (diff)
parent829841146878e082613a49581ae252c071057c23 (diff)
Merge branch 'master'
Diffstat (limited to 'include/asm-sparc/system.h')
-rw-r--r--include/asm-sparc/system.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/system.h b/include/asm-sparc/system.h
index 3557781a4bfd..1f6b71f9e1b6 100644
--- a/include/asm-sparc/system.h
+++ b/include/asm-sparc/system.h
@@ -204,7 +204,7 @@ static inline unsigned long getipl(void)
BTFIXUPDEF_CALL(void, ___xchg32, void)
#endif
-extern __inline__ unsigned long xchg_u32(__volatile__ unsigned long *m, unsigned long val)
+static inline unsigned long xchg_u32(__volatile__ unsigned long *m, unsigned long val)
{
#ifdef CONFIG_SMP
__asm__ __volatile__("swap [%2], %0"