X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=arch%2Farm%2Finclude%2Fasm%2Fatomic.h;h=171f4d979281f7739fb40340edabdf11937ee761;hb=4f84cb980fdc25d7735fe114021b4a84ea601b9f;hp=34c07fe5005a900346fff26b5e510006c3cd7140;hpb=b5b8d85e9a50c2294b6043830cd045de1002dc5d;p=oweals%2Fu-boot.git

diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
index 34c07fe500..171f4d9792 100644
--- a/arch/arm/include/asm/atomic.h
+++ b/arch/arm/include/asm/atomic.h
@@ -21,6 +21,11 @@
 #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) }
 
@@ -28,11 +33,13 @@ typedef struct { volatile int counter; } atomic_t;
 #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;
@@ -41,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;
@@ -50,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;
@@ -59,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;
@@ -68,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);
@@ -81,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);
@@ -94,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()