korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-30 07:34:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

h8300: IRQ flags should be stored in an unsigned long

Browse Source 
Fix h8300's asm/atomic.h to store the IRQ flags in an unsigned long to deal
with warnings of the following type:

  arch/h8300/include/asm/atomic.h: In function 'atomic_add_return':
  arch/h8300/include/asm/atomic.h:22: warning: comparison of distinct pointer types lacks a cast
  arch/h8300/include/asm/atomic.h:24: warning: comparison of distinct pointer types lacks a cast

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
David Howells 2010-08-31 16:52:11 +01:00 committed by Linus Torvalds
parent 7a2e8a8faa
commit 3ab61eb9fd
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/h8300/include/asm/atomic.h
View File

@ -18,7 +18,8 @@
static __inline__ int atomic_add_return(int i, atomic_t *v) static __inline__ int atomic_add_return(int i, atomic_t *v)
{ {
int ret,flags; unsigned long flags;
int ret;
local_irq_save(flags); local_irq_save(flags);
ret = v->counter += i; ret = v->counter += i;
local_irq_restore(flags); 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) static __inline__ int atomic_sub_return(int i, atomic_t *v)
{ {
int ret,flags; unsigned long flags;
int ret;
local_irq_save(flags); local_irq_save(flags);
ret = v->counter -= i; ret = v->counter -= i;
local_irq_restore(flags); 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) static __inline__ int atomic_inc_return(atomic_t *v)
{ {
int ret,flags; unsigned long flags;
int ret;
local_irq_save(flags); local_irq_save(flags);
v->counter++; v->counter++;
ret = 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) static __inline__ int atomic_dec_return(atomic_t *v)
{ {
int ret,flags; unsigned long flags;
int ret;
local_irq_save(flags); local_irq_save(flags);
--v->counter; --v->counter;
ret = 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) static __inline__ int atomic_dec_and_test(atomic_t *v)
{ {
int ret,flags; unsigned long flags;
int ret;
local_irq_save(flags); local_irq_save(flags);
--v->counter; --v->counter;
ret = v->counter; ret = v->counter;