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

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

diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
index 1b22eeb5fc242cdbbfabea683efee6b1e5976bc0..9b79506b594b0efd4ebee15d1e540f503a70fdb3 100644 (file)
--- a/arch/arm/include/asm/atomic.h
+++ b/arch/arm/include/asm/atomic.h
@@ -25,14 +25,14 @@ typedef struct { volatile int counter; } atomic_t;
 #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))
 
 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 +41,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 +50,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 +59,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 +68,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 +81,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,7 +94,7 @@ 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;