From 741b97076074b78a07de8d0783071f9a9cfc5a29 Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Sun, 1 Apr 2012 16:38:47 -0400
Subject: [PATCH] --- yaml --- r: 298431 b: refs/heads/master c:
 80da6a4feeb9e4d6554f771f14f5b994e6c6c7e8 h: refs/heads/master i:   298429:
 330a51a412f08d5864c0441abd84a07da1858f16   298427:
 da2fdf55ea95181810de2f10360e6de685f3c15f   298423:
 47a6364484be3750da3aada44b4ffa6c6800671a   298415:
 08e04228b97fb002ccdef4085330749d44517fff   298399:
 f714ff3a5bec401d5e764704fee0461fa2fe3e46   298367:
 82e8cc85497ba395c7e5dc47a739cad9e4ecffc3 v: v3

---
 [refs]                              | 2 +-
 trunk/include/asm-generic/cmpxchg.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 47514ac9f8e8..b81df7b95cef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f68c56b7d2351036d1ec58c7a0ac4f258cbc1fa2
+refs/heads/master: 80da6a4feeb9e4d6554f771f14f5b994e6c6c7e8
diff --git a/trunk/include/asm-generic/cmpxchg.h b/trunk/include/asm-generic/cmpxchg.h
index 8a361834dc25..14883026015d 100644
--- a/trunk/include/asm-generic/cmpxchg.h
+++ b/trunk/include/asm-generic/cmpxchg.h
@@ -10,6 +10,7 @@
 #error "Cannot use generic cmpxchg on SMP"
 #endif
 
+#include <linux/types.h>
 #include <linux/irqflags.h>
 
 #ifndef xchg