From b999ddb4b67089199ebc91f78ba2b481fd7f8a28 Mon Sep 17 00:00:00 2001
From: Steve Langasek <vorlon@debian.org>
Date: Tue, 7 Feb 2006 12:58:35 -0800
Subject: [PATCH] --- yaml --- r: 19974 b: refs/heads/master c:
 c00a76aea339b427b47ddc28de06dee0a652e801 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/include/asm-alpha/system.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c315ac54abfc..3e425f20e142 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2f8311d3168ed7d391ba5df5b80f4af0a3457d0
+refs/heads/master: c00a76aea339b427b47ddc28de06dee0a652e801
diff --git a/trunk/include/asm-alpha/system.h b/trunk/include/asm-alpha/system.h
index cc9c7e8cced5..f3b7b1a59c56 100644
--- a/trunk/include/asm-alpha/system.h
+++ b/trunk/include/asm-alpha/system.h
@@ -572,7 +572,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) {