2011-04-20 10:31:52

by Xuetao Guan

Subject: [PATCH] asm-generic: solve the conflict of atomic64_t type with linux/types.h and asm-generic/atomic64.h

Signed-off-by: Guan Xuetao <[email protected]>
---
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