summaryrefslogtreecommitdiff
path: root/arch/ia64/include/asm/atomic.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-11 05:43:52 +0300
committerIngo Molnar <mingo@elte.hu>2009-01-11 05:43:52 +0300
commit99cd7074891f87c49660e3b2880564324a4733ac (patch)
tree903d2665bcb445f1f265d1adf7a99f265bcefc15 /arch/ia64/include/asm/atomic.h
parente8a9cbf6ae620d9e5ba9cb42001c033287a284a3 (diff)
parentc59765042f53a79a7a65585042ff463b69cb248c (diff)
downloadlinux-99cd7074891f87c49660e3b2880564324a4733ac.tar.xz
Merge commit 'v2.6.29-rc1' into tracing/urgent
Diffstat (limited to 'arch/ia64/include/asm/atomic.h')
-rw-r--r--arch/ia64/include/asm/atomic.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
index 50c2b83fd5a0..d37292bd9875 100644
--- a/arch/ia64/include/asm/atomic.h
+++ b/arch/ia64/include/asm/atomic.h
@@ -17,12 +17,6 @@
#include <asm/intrinsics.h>
#include <asm/system.h>
-/*
- * On IA-64, counter must always be volatile to ensure that that the
- * memory accesses are ordered.
- */
-typedef struct { volatile __s32 counter; } atomic_t;
-typedef struct { volatile __s64 counter; } atomic64_t;
#define ATOMIC_INIT(i) ((atomic_t) { (i) })
#define ATOMIC64_INIT(i) ((atomic64_t) { (i) })