From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 30 Nov 2006 15:38:10 +0000 (+0000)
Subject: [MIPS] Fix atomic.h build errors.
X-Git-Tag: v2.6.20-rc1~34^2~40^2~7^2~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f8b5c70967de5fd27f2092f1f8da47f4705bb67;p=linux-2.6

[MIPS] Fix atomic.h build errors.

For the definition of atomic64_t atomic.h was relying on <asm/types.h>
having been included previously.  Before changeset
d89d8e0637a5e4e0a12e90c4bc934d0d4c335239 this was happening as a
side effect of including <linux/spinlock.h>.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/include/asm-mips/atomic.h b/include/asm-mips/atomic.h
index 7978d8e116..365767074c 100644
--- a/include/asm-mips/atomic.h
+++ b/include/asm-mips/atomic.h
@@ -375,7 +375,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
 
 #ifdef CONFIG_64BIT
 
-typedef struct { volatile __s64 counter; } atomic64_t;
+typedef struct { volatile long counter; } atomic64_t;
 
 #define ATOMIC64_INIT(i)    { (i) }