lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Blackfin: fix flag storage for irq funcs

Browse Source 
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: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger
2009-06-08 09:51:30 -04:00
parent 82bd1d7d45
commit f9ee3ab81c
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/blackfin/include/asm/atomic.h
View File

@@ -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)
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)
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)
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)
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)
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)
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)
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;

3
arch/blackfin/include/asm/bitops.h
View File

@@ -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;