diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2010-09-14 16:15:29 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-14 16:15:29 +0200 |
| commit | f3fbba6efbab93b9850821d41a75b02286d18315 (patch) | |
| tree | e2a680674d334c6e455d1a89a4dbfc3f549cb6d1 /arch/h8300/include/asm/atomic.h | |
| parent | ALSA: snd-usb-caiaq: Add support for Traktor Kontrol S4 (diff) | |
| parent | sound: Remove pr_<level> uses of KERN_<level> (diff) | |
| download | linux-dev-f3fbba6efbab93b9850821d41a75b02286d18315.tar.xz linux-dev-f3fbba6efbab93b9850821d41a75b02286d18315.zip | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'arch/h8300/include/asm/atomic.h')
| -rw-r--r-- | arch/h8300/include/asm/atomic.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/arch/h8300/include/asm/atomic.h b/arch/h8300/include/asm/atomic.h index e936804b7508..984221abb66d 100644 --- a/arch/h8300/include/asm/atomic.h +++ b/arch/h8300/include/asm/atomic.h @@ -18,7 +18,8 @@ static __inline__ int atomic_add_return(int i, atomic_t *v) { - int ret,flags; + unsigned long flags; + int ret; local_irq_save(flags); ret = v->counter += i; local_irq_restore(flags); @@ -30,7 +31,8 @@ static __inline__ int atomic_add_return(int i, atomic_t *v) static __inline__ int atomic_sub_return(int i, atomic_t *v) { - int ret,flags; + unsigned long flags; + int ret; local_irq_save(flags); ret = v->counter -= i; local_irq_restore(flags); @@ -42,7 +44,8 @@ static __inline__ int atomic_sub_return(int i, atomic_t *v) static __inline__ int atomic_inc_return(atomic_t *v) { - int ret,flags; + unsigned long flags; + int ret; local_irq_save(flags); v->counter++; ret = v->counter; @@ -64,7 +67,8 @@ static __inline__ int atomic_inc_return(atomic_t *v) static __inline__ int atomic_dec_return(atomic_t *v) { - int ret,flags; + unsigned long flags; + int ret; local_irq_save(flags); --v->counter; ret = v->counter; @@ -76,7 +80,8 @@ static __inline__ int atomic_dec_return(atomic_t *v) static __inline__ int atomic_dec_and_test(atomic_t *v) { - int ret,flags; + unsigned long flags; + int ret; local_irq_save(flags); --v->counter; ret = v->counter; |