---

yaml --- r: 297250 b: refs/heads/master c: 3448427 h: refs/heads/master v: v3
git-mirror · Mar 28, 2012 · ba1d8bb · ba1d8bb
1 parent 9182aab
commit ba1d8bb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -19,7 +19,6 @@
 #include <linux/types.h>
 #include <linux/irqflags.h>
 
-#include <asm/cmpxchg-local.h>
 #include <asm/cmpxchg.h>
 
 struct task_struct;
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,8 @@ @@
     #error "Cannot use generic cmpxchg on SMP"
     #endif
+    #include <asm-generic/cmpxchg-local.h>
     /*
      * Atomic compare and exchange.
      *
@@ Expand Down @@