summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2012-03-30 11:43:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-30 12:34:07 -0700
commit40380f1c7841a5dcbf0b20f0b6da11969211ef77 (patch)
tree7c3ecf31e740ae8129f0d6c33fc4a55181b03e62 /arch
parent48a46752a9a43c9bd106cc9798ee511feef5b7e6 (diff)
ia64: Fixup asm/cmpxchg.h
The empty asm/cmpxchg.h file that was provided as a temporary build fix for the asm/system.h disintgration build problem should really include <asm/intrinsics.h> to make definitions of xchg() and cmpxchg() available. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/include/asm/cmpxchg.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/cmpxchg.h b/arch/ia64/include/asm/cmpxchg.h
index 507c66c77600..4c96187e2049 100644
--- a/arch/ia64/include/asm/cmpxchg.h
+++ b/arch/ia64/include/asm/cmpxchg.h
@@ -1 +1 @@
-/* Future home of xchg() and cmpxchg() */
+#include <asm/intrinsics.h>