diff options
| author | Russell King <rmk@flint.arm.linux.org.uk> | 2002-06-10 00:56:28 +0100 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2002-06-10 00:56:28 +0100 |
| commit | e0addcb4965b4635cbd8a174f050c32fea340361 (patch) | |
| tree | 2f8ca9e93c50c337b4e2e041527b9bf622b02482 /include | |
| parent | 30009ebe24e1a13d7dfd43ba99f175ed3c4773aa (diff) | |
[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())
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/atomic.h | 12 | ||||
| -rw-r--r-- | include/asm-arm/suspend.h | 0 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-arm/atomic.h b/include/asm-arm/atomic.h index 59baa4e88114..1930c34e48a3 100644 --- a/include/asm-arm/atomic.h +++ b/include/asm-arm/atomic.h @@ -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; diff --git a/include/asm-arm/suspend.h b/include/asm-arm/suspend.h new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/include/asm-arm/suspend.h |