From 45047de28d7dd8767fb8e29bf76b48645dbc121a Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 3 Jul 2009 12:51:19 +0200
Subject: [PATCH] --- yaml --- r: 155212 b: refs/heads/master c:
 3ac805d2afd3fa4a07cb5bcf352fd7fa83f28935 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/lib/atomic64_32.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d5f9b5c562f4..f104f1deefab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 824975ef190e7dcb77718d1cc2cb53769b16d918
+refs/heads/master: 3ac805d2afd3fa4a07cb5bcf352fd7fa83f28935
diff --git a/trunk/arch/x86/lib/atomic64_32.c b/trunk/arch/x86/lib/atomic64_32.c
index 61959627e1e1..a910238a7760 100644
--- a/trunk/arch/x86/lib/atomic64_32.c
+++ b/trunk/arch/x86/lib/atomic64_32.c
@@ -4,7 +4,7 @@
 #include <asm/cmpxchg.h>
 #include <asm/atomic.h>
 
-static inline u64 cmpxchg8b(u64 *ptr, u64 old, u64 new)
+static noinline u64 cmpxchg8b(u64 *ptr, u64 old, u64 new)
 {
 	u32 low = new;
 	u32 high = new >> 32;
@@ -74,7 +74,7 @@ u64 atomic64_read(atomic64_t *ptr)
  *
  * Atomically adds @delta to @ptr and returns @delta + *@ptr
  */
-u64 atomic64_add_return(u64 delta, atomic64_t *ptr)
+noinline u64 atomic64_add_return(u64 delta, atomic64_t *ptr)
 {
 	/*
 	 * Try first with a (probably incorrect) assumption about