Merge branch 'master' of git://git.denx.de/u-boot-socfpga

[u-boot] / arch / arm / include / asm / atomic.h

diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
index ba9e4b72d8214d6a87f23ef89721a90759069539..171f4d979281f7739fb40340edabdf11937ee761 100644 (file)
--- a/arch/arm/include/asm/atomic.h
+++ b/arch/arm/include/asm/atomic.h
@@ -16,25 +16,30 @@
 #ifndef __ASM_ARM_ATOMIC_H
 #define __ASM_ARM_ATOMIC_H
 
-#include <linux/config.h>
-
 #ifdef CONFIG_SMP
 #error SMP not supported
 #endif
 
 typedef struct { volatile int counter; } atomic_t;
+#if BITS_PER_LONG == 32
+typedef struct { volatile long long counter; } atomic64_t;
+#else /* BIT_PER_LONG == 32 */
+typedef struct { volatile long counter; } atomic64_t;
+#endif
 
 #define ATOMIC_INIT(i) { (i) }
 
 #ifdef __KERNEL__
-#include <asm/proc/system.h>
+#include <asm/proc-armv/system.h>
 
 #define atomic_read(v) ((v)->counter)
-#define atomic_set(v,i)        (((v)->counter) = (i))
+#define atomic_set(v, i)       (((v)->counter) = (i))
+#define atomic64_read(v)       atomic_read(v)
+#define atomic64_set(v, i)     atomic_set(v, i)
 
 static inline void atomic_add(int i, volatile atomic_t *v)
 {
-       unsigned long flags;
+       unsigned long flags = 0;
 
        local_irq_save(flags);
        v->counter += i;
@@ -43,7 +48,7 @@ static inline void atomic_add(int i, volatile atomic_t *v)
 
 static inline void atomic_sub(int i, volatile atomic_t *v)
 {
-       unsigned long flags;
+       unsigned long flags = 0;
 
        local_irq_save(flags);
        v->counter -= i;
@@ -52,7 +57,7 @@ static inline void atomic_sub(int i, volatile atomic_t *v)
 
 static inline void atomic_inc(volatile atomic_t *v)
 {
-       unsigned long flags;
+       unsigned long flags = 0;
 
        local_irq_save(flags);
        v->counter += 1;
@@ -61,7 +66,7 @@ static inline void atomic_inc(volatile atomic_t *v)
 
 static inline void atomic_dec(volatile atomic_t *v)
 {
-       unsigned long flags;
+       unsigned long flags = 0;
 
        local_irq_save(flags);
        v->counter -= 1;
@@ -70,7 +75,7 @@ static inline void atomic_dec(volatile atomic_t *v)
 
 static inline int atomic_dec_and_test(volatile atomic_t *v)
 {
-       unsigned long flags;
+       unsigned long flags = 0;
        int val;
 
        local_irq_save(flags);
@@ -83,7 +88,7 @@ static inline int atomic_dec_and_test(volatile atomic_t *v)
 
 static inline int atomic_add_negative(int i, volatile atomic_t *v)
 {
-       unsigned long flags;
+       unsigned long flags = 0;
        int val;
 
        local_irq_save(flags);
@@ -96,13 +101,72 @@ static inline int atomic_add_negative(int i, volatile atomic_t *v)
 
 static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
 {
-       unsigned long flags;
+       unsigned long flags = 0;
 
        local_irq_save(flags);
        *addr &= ~mask;
        local_irq_restore(flags);
 }
 
+#if BITS_PER_LONG == 32
+
+static inline void atomic64_add(long long i, volatile atomic64_t *v)
+{
+       unsigned long flags = 0;
+
+       local_irq_save(flags);
+       v->counter += i;
+       local_irq_restore(flags);
+}
+
+static inline void atomic64_sub(long long i, volatile atomic64_t *v)
+{
+       unsigned long flags = 0;
+
+       local_irq_save(flags);
+       v->counter -= i;
+       local_irq_restore(flags);
+}
+
+#else /* BIT_PER_LONG == 32 */
+
+static inline void atomic64_add(long i, volatile atomic64_t *v)
+{
+       unsigned long flags = 0;
+
+       local_irq_save(flags);
+       v->counter += i;
+       local_irq_restore(flags);
+}
+
+static inline void atomic64_sub(long i, volatile atomic64_t *v)
+{
+       unsigned long flags = 0;
+
+       local_irq_save(flags);
+       v->counter -= i;
+       local_irq_restore(flags);
+}
+#endif
+
+static inline void atomic64_inc(volatile atomic64_t *v)
+{
+       unsigned long flags = 0;
+
+       local_irq_save(flags);
+       v->counter += 1;
+       local_irq_restore(flags);
+}
+
+static inline void atomic64_dec(volatile atomic64_t *v)
+{
+       unsigned long flags = 0;
+
+       local_irq_save(flags);
+       v->counter -= 1;
+       local_irq_restore(flags);
+}
+
 /* Atomic operations are already serializing on ARM */
 #define smp_mb__before_atomic_dec()    barrier()
 #define smp_mb__after_atomic_dec()     barrier()