Skip to content

Commit

Permalink
sh: Use the atomic_t "counter" member
Browse files Browse the repository at this point in the history
Now that atomic_t is a generic opaque type for all architectures, it is
unwise to use intimate knowledge of its internals when manipulating it.

Instead of relying on the "counter" member being at offset 0 from the
beginning of an atomic_t, explicitly reference the member. This guards
us from any changes to the layout of the beginning of the atomic_t type.

Signed-off-by: Matt Fleming <matt@console-pimps.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Matt Fleming authored and Paul Mundt committed Jan 29, 2009
1 parent 4299070 commit 84fdf6c
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions arch/sh/include/asm/atomic-irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ static inline void atomic_add(int i, atomic_t *v)
unsigned long flags;

local_irq_save(flags);
*(long *)v += i;
v->counter += i;
local_irq_restore(flags);
}

Expand All @@ -20,7 +20,7 @@ static inline void atomic_sub(int i, atomic_t *v)
unsigned long flags;

local_irq_save(flags);
*(long *)v -= i;
v->counter -= i;
local_irq_restore(flags);
}

Expand All @@ -29,9 +29,9 @@ static inline int atomic_add_return(int i, atomic_t *v)
unsigned long temp, flags;

local_irq_save(flags);
temp = *(long *)v;
temp = v->counter;
temp += i;
*(long *)v = temp;
v->counter = temp;
local_irq_restore(flags);

return temp;
Expand All @@ -42,9 +42,9 @@ static inline int atomic_sub_return(int i, atomic_t *v)
unsigned long temp, flags;

local_irq_save(flags);
temp = *(long *)v;
temp = v->counter;
temp -= i;
*(long *)v = temp;
v->counter = temp;
local_irq_restore(flags);

return temp;
Expand All @@ -55,7 +55,7 @@ static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
unsigned long flags;

local_irq_save(flags);
*(long *)v &= ~mask;
v->counter &= ~mask;
local_irq_restore(flags);
}

Expand All @@ -64,7 +64,7 @@ static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
unsigned long flags;

local_irq_save(flags);
*(long *)v |= mask;
v->counter |= mask;
local_irq_restore(flags);
}

Expand Down

0 comments on commit 84fdf6c

Please sign in to comment.