From 24e139e14438eec9a8da85fa44186aa8519197ea Mon Sep 17 00:00:00 2001
From: "Luck, Tony" <tony.luck@intel.com>
Date: Thu, 29 Mar 2012 13:35:22 -0700
Subject: [PATCH] --- yaml --- r: 297377 b: refs/heads/master c:
 93f378883cecb9dcb2cf5b51d9d24175906659da h: refs/heads/master i:   297375:
 b2c92e8f8ff3abb16ed527e67d1eb721d90a222f v: v3

---
 [refs]                                | 2 +-
 trunk/arch/ia64/include/asm/cmpxchg.h | 1 +
 trunk/arch/ia64/kernel/process.c      | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 trunk/arch/ia64/include/asm/cmpxchg.h

diff --git a/[refs] b/[refs]
index 580a6ea4d53f..8b259806d18c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55a320308902f7a0746569ee57eeb3f254e6ed16
+refs/heads/master: 93f378883cecb9dcb2cf5b51d9d24175906659da
diff --git a/trunk/arch/ia64/include/asm/cmpxchg.h b/trunk/arch/ia64/include/asm/cmpxchg.h
new file mode 100644
index 000000000000..507c66c77600
--- /dev/null
+++ b/trunk/arch/ia64/include/asm/cmpxchg.h
@@ -0,0 +1 @@
+/* Future home of xchg() and cmpxchg() */
diff --git a/trunk/arch/ia64/kernel/process.c b/trunk/arch/ia64/kernel/process.c
index 9dc52b63fc87..ce74e143aea3 100644
--- a/trunk/arch/ia64/kernel/process.c
+++ b/trunk/arch/ia64/kernel/process.c
@@ -38,6 +38,7 @@
 #include <asm/pgalloc.h>
 #include <asm/processor.h>
 #include <asm/sal.h>
+#include <asm/switch_to.h>
 #include <asm/tlbflush.h>
 #include <asm/uaccess.h>
 #include <asm/unwind.h>