Commit e0addcb4 authored by Russell King's avatar Russell King

[ARM] 3 trivial changes:

 - Add ARM version for asm/suspend.h
 - Use inline in atomic.h rather than __inline__
 - Fix up a missed superblock conversion in fs/adfs/map.c
   (hadn't been converted to use ADFS_SB())
parent 30009ebe
......@@ -257,7 +257,7 @@ int
adfs_map_lookup(struct super_block *sb, unsigned int frag_id,
unsigned int offset)
{
struct adfs_sb_info *asb = &sb->u.adfs_sb;
struct adfs_sb_info *asb = ADFS_SB(sb);
unsigned int zone, mapoff;
int result;
......
......@@ -32,7 +32,7 @@ typedef struct { volatile int counter; } atomic_t;
#define atomic_read(v) ((v)->counter)
#define atomic_set(v,i) (((v)->counter) = (i))
static __inline__ void atomic_add(int i, volatile atomic_t *v)
static inline void atomic_add(int i, volatile atomic_t *v)
{
unsigned long flags;
......@@ -41,7 +41,7 @@ static __inline__ void atomic_add(int i, volatile atomic_t *v)
__restore_flags(flags);
}
static __inline__ void atomic_sub(int i, volatile atomic_t *v)
static inline void atomic_sub(int i, volatile atomic_t *v)
{
unsigned long flags;
......@@ -50,7 +50,7 @@ static __inline__ void atomic_sub(int i, volatile atomic_t *v)
__restore_flags(flags);
}
static __inline__ void atomic_inc(volatile atomic_t *v)
static inline void atomic_inc(volatile atomic_t *v)
{
unsigned long flags;
......@@ -59,7 +59,7 @@ static __inline__ void atomic_inc(volatile atomic_t *v)
__restore_flags(flags);
}
static __inline__ void atomic_dec(volatile atomic_t *v)
static inline void atomic_dec(volatile atomic_t *v)
{
unsigned long flags;
......@@ -68,7 +68,7 @@ static __inline__ void atomic_dec(volatile atomic_t *v)
__restore_flags(flags);
}
static __inline__ int atomic_dec_and_test(volatile atomic_t *v)
static inline int atomic_dec_and_test(volatile atomic_t *v)
{
unsigned long flags;
int val;
......@@ -94,7 +94,7 @@ static inline int atomic_add_negative(int i, volatile atomic_t *v)
return val < 0;
}
static __inline__ void atomic_clear_mask(unsigned long mask, unsigned long *addr)
static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
{
unsigned long flags;
......
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