* [PATCH] asm-generic: solve the conflict of atomic64_t type with linux/types.h and asm-generic/atomic64.h
@ 2011-04-20 10:31 Guan Xuetao
2011-04-20 10:31 ` Guan Xuetao
0 siblings, 1 reply; 2+ messages in thread
From: Guan Xuetao @ 2011-04-20 10:31 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-kernel, linux-arch
Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
---
include/asm-generic/atomic64.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
index b18ce4f..cc6e272 100644
--- a/include/asm-generic/atomic64.h
+++ b/include/asm-generic/atomic64.h
@@ -12,9 +12,11 @@
#ifndef _ASM_GENERIC_ATOMIC64_H
#define _ASM_GENERIC_ATOMIC64_H
+#ifndef CONFIG_64BIT
typedef struct {
long long counter;
} atomic64_t;
+#endif
#define ATOMIC64_INIT(i) { (i) }
--
1.6.2.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-04-20 10:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-20 10:31 [PATCH] asm-generic: solve the conflict of atomic64_t type with linux/types.h and asm-generic/atomic64.h Guan Xuetao
2011-04-20 10:31 ` Guan Xuetao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox