From ba1d8bb5f5fa9dd5a2c1557a5db0dfe119eb2e73 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Wed, 28 Mar 2012 18:30:03 +0100
Subject: [PATCH] --- yaml --- r: 297250 b: refs/heads/master c:
 34484277b173d0af1bb00532a264940b57920429 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/include/asm-generic/atomic.h  | 2 ++
 trunk/include/asm-generic/cmpxchg.h | 2 ++
 trunk/include/asm-generic/system.h  | 1 -
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2e395a4dc4d6..8f8177f05468 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9aa7e1882f3ceec919b30f64a2ce6e66a2571b1
+refs/heads/master: 34484277b173d0af1bb00532a264940b57920429
diff --git a/trunk/include/asm-generic/atomic.h b/trunk/include/asm-generic/atomic.h
index e37963c1df4d..8b8cf9412989 100644
--- a/trunk/include/asm-generic/atomic.h
+++ b/trunk/include/asm-generic/atomic.h
@@ -15,6 +15,8 @@
 #ifndef __ASM_GENERIC_ATOMIC_H
 #define __ASM_GENERIC_ATOMIC_H
 
+#include <asm/cmpxchg.h>
+
 #ifdef CONFIG_SMP
 /* Force people to define core atomics */
 # if !defined(atomic_add_return) || !defined(atomic_sub_return) || \
diff --git a/trunk/include/asm-generic/cmpxchg.h b/trunk/include/asm-generic/cmpxchg.h
index 213ac6e8fe39..e0449af91f60 100644
--- a/trunk/include/asm-generic/cmpxchg.h
+++ b/trunk/include/asm-generic/cmpxchg.h
@@ -10,6 +10,8 @@
 #error "Cannot use generic cmpxchg on SMP"
 #endif
 
+#include <asm-generic/cmpxchg-local.h>
+
 /*
  * Atomic compare and exchange.
  *
diff --git a/trunk/include/asm-generic/system.h b/trunk/include/asm-generic/system.h
index 215efa74f5a2..82cb53abb9f6 100644
--- a/trunk/include/asm-generic/system.h
+++ b/trunk/include/asm-generic/system.h
@@ -19,7 +19,6 @@
 #include <linux/types.h>
 #include <linux/irqflags.h>
 
-#include <asm/cmpxchg-local.h>
 #include <asm/cmpxchg.h>
 
 struct task_struct;