Commit f9ee3ab8 authored by Mike Frysinger's avatar Mike Frysinger

Blackfin: fix flag storage for irq funcs

The IRQ functions take an "unsigned long" flags variable, not any other
type, so fix the places where we use "int" or "long".
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 82bd1d7d
...@@ -90,7 +90,7 @@ static inline int atomic_test_mask(int mask, atomic_t *v) ...@@ -90,7 +90,7 @@ static inline int atomic_test_mask(int mask, atomic_t *v)
static inline void atomic_add(int i, atomic_t *v) static inline void atomic_add(int i, atomic_t *v)
{ {
long flags; unsigned long flags;
local_irq_save_hw(flags); local_irq_save_hw(flags);
v->counter += i; v->counter += i;
...@@ -99,7 +99,7 @@ static inline void atomic_add(int i, atomic_t *v) ...@@ -99,7 +99,7 @@ static inline void atomic_add(int i, atomic_t *v)
static inline void atomic_sub(int i, atomic_t *v) static inline void atomic_sub(int i, atomic_t *v)
{ {
long flags; unsigned long flags;
local_irq_save_hw(flags); local_irq_save_hw(flags);
v->counter -= i; v->counter -= i;
...@@ -110,7 +110,7 @@ static inline void atomic_sub(int i, atomic_t *v) ...@@ -110,7 +110,7 @@ static inline void atomic_sub(int i, atomic_t *v)
static inline int atomic_add_return(int i, atomic_t *v) static inline int atomic_add_return(int i, atomic_t *v)
{ {
int __temp = 0; int __temp = 0;
long flags; unsigned long flags;
local_irq_save_hw(flags); local_irq_save_hw(flags);
v->counter += i; v->counter += i;
...@@ -124,7 +124,7 @@ static inline int atomic_add_return(int i, atomic_t *v) ...@@ -124,7 +124,7 @@ static inline int atomic_add_return(int i, atomic_t *v)
static inline int atomic_sub_return(int i, atomic_t *v) static inline int atomic_sub_return(int i, atomic_t *v)
{ {
int __temp = 0; int __temp = 0;
long flags; unsigned long flags;
local_irq_save_hw(flags); local_irq_save_hw(flags);
v->counter -= i; v->counter -= i;
...@@ -136,7 +136,7 @@ static inline int atomic_sub_return(int i, atomic_t *v) ...@@ -136,7 +136,7 @@ static inline int atomic_sub_return(int i, atomic_t *v)
static inline void atomic_inc(volatile atomic_t *v) static inline void atomic_inc(volatile atomic_t *v)
{ {
long flags; unsigned long flags;
local_irq_save_hw(flags); local_irq_save_hw(flags);
v->counter++; v->counter++;
...@@ -145,7 +145,7 @@ static inline void atomic_inc(volatile atomic_t *v) ...@@ -145,7 +145,7 @@ static inline void atomic_inc(volatile atomic_t *v)
static inline void atomic_dec(volatile atomic_t *v) static inline void atomic_dec(volatile atomic_t *v)
{ {
long flags; unsigned long flags;
local_irq_save_hw(flags); local_irq_save_hw(flags);
v->counter--; v->counter--;
...@@ -154,7 +154,7 @@ static inline void atomic_dec(volatile atomic_t *v) ...@@ -154,7 +154,7 @@ static inline void atomic_dec(volatile atomic_t *v)
static inline void atomic_clear_mask(unsigned int mask, atomic_t *v) static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
{ {
long flags; unsigned long flags;
local_irq_save_hw(flags); local_irq_save_hw(flags);
v->counter &= ~mask; v->counter &= ~mask;
...@@ -163,7 +163,7 @@ static inline void atomic_clear_mask(unsigned int mask, atomic_t *v) ...@@ -163,7 +163,7 @@ static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
static inline void atomic_set_mask(unsigned int mask, atomic_t *v) static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
{ {
long flags; unsigned long flags;
local_irq_save_hw(flags); local_irq_save_hw(flags);
v->counter |= mask; v->counter |= mask;
......
...@@ -109,7 +109,8 @@ static inline void clear_bit(int nr, volatile unsigned long *addr) ...@@ -109,7 +109,8 @@ static inline void clear_bit(int nr, volatile unsigned long *addr)
static inline void change_bit(int nr, volatile unsigned long *addr) static inline void change_bit(int nr, volatile unsigned long *addr)
{ {
int mask, flags; int mask;
unsigned long flags;
unsigned long *ADDR = (unsigned long *)addr; unsigned long *ADDR = (unsigned long *)addr;
ADDR += nr >> 5; ADDR += nr >> 5;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment