diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-11 16:17:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-11 16:17:24 -0400 |
| commit | 4e3408d9f71a70316ebe844c20ef0d7715281f84 (patch) | |
| tree | 365f67fbcbe8e047a5fbead3db5d2e7ac20b3618 /arch/s390 | |
| parent | a66a50054e46ec2a03244bc14c48b9125fcd75a7 (diff) | |
| parent | 96910b6dc8a4fdb75e69f09f47b62d41743d36ba (diff) | |
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (32 commits)
locking, m68k/asm-offsets: Rename signal defines
locking: Inline spinlock code for all locking variants on s390
locking: Simplify spinlock inlining
locking: Allow arch-inlined spinlocks
locking: Move spinlock function bodies to header file
locking, m68k: Calculate thread_info offset with asm offset
locking, m68k/asm-offsets: Rename pt_regs offset defines
locking, sparc: Rename __spin_try_lock() and friends
locking, powerpc: Rename __spin_try_lock() and friends
lockdep: Remove recursion stattistics
lockdep: Simplify lock_stat seqfile code
lockdep: Simplify lockdep_chains seqfile code
lockdep: Simplify lockdep seqfile code
lockdep: Fix missing entries in /proc/lock_chains
lockdep: Fix missing entry in /proc/lock_stat
lockdep: Fix memory usage info of BFS
lockdep: Reintroduce generation count to make BFS faster
lockdep: Deal with many similar locks
lockdep: Introduce lockdep_assert_held()
lockdep: Fix style nits
...
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/include/asm/spinlock.h | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/arch/s390/include/asm/spinlock.h b/arch/s390/include/asm/spinlock.h index c9af0d19c7ab..41ce6861174e 100644 --- a/arch/s390/include/asm/spinlock.h +++ b/arch/s390/include/asm/spinlock.h | |||
| @@ -191,4 +191,33 @@ static inline int __raw_write_trylock(raw_rwlock_t *rw) | |||
| 191 | #define _raw_read_relax(lock) cpu_relax() | 191 | #define _raw_read_relax(lock) cpu_relax() |
| 192 | #define _raw_write_relax(lock) cpu_relax() | 192 | #define _raw_write_relax(lock) cpu_relax() |
| 193 | 193 | ||
| 194 | #define __always_inline__spin_lock | ||
| 195 | #define __always_inline__read_lock | ||
| 196 | #define __always_inline__write_lock | ||
| 197 | #define __always_inline__spin_lock_bh | ||
| 198 | #define __always_inline__read_lock_bh | ||
| 199 | #define __always_inline__write_lock_bh | ||
| 200 | #define __always_inline__spin_lock_irq | ||
| 201 | #define __always_inline__read_lock_irq | ||
| 202 | #define __always_inline__write_lock_irq | ||
| 203 | #define __always_inline__spin_lock_irqsave | ||
| 204 | #define __always_inline__read_lock_irqsave | ||
| 205 | #define __always_inline__write_lock_irqsave | ||
| 206 | #define __always_inline__spin_trylock | ||
| 207 | #define __always_inline__read_trylock | ||
| 208 | #define __always_inline__write_trylock | ||
| 209 | #define __always_inline__spin_trylock_bh | ||
| 210 | #define __always_inline__spin_unlock | ||
| 211 | #define __always_inline__read_unlock | ||
| 212 | #define __always_inline__write_unlock | ||
| 213 | #define __always_inline__spin_unlock_bh | ||
| 214 | #define __always_inline__read_unlock_bh | ||
| 215 | #define __always_inline__write_unlock_bh | ||
| 216 | #define __always_inline__spin_unlock_irq | ||
| 217 | #define __always_inline__read_unlock_irq | ||
| 218 | #define __always_inline__write_unlock_irq | ||
| 219 | #define __always_inline__spin_unlock_irqrestore | ||
| 220 | #define __always_inline__read_unlock_irqrestore | ||
| 221 | #define __always_inline__write_unlock_irqrestore | ||
| 222 | |||
| 194 | #endif /* __ASM_SPINLOCK_H */ | 223 | #endif /* __ASM_SPINLOCK_H */ |