Commit 3ab61eb9 authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

h8300: IRQ flags should be stored in an unsigned long



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: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7a2e8a8f
Loading
Loading
Loading
Loading
+10 −5
Original line number Diff line number Diff line
@@ -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;