Skip to content

L
linux
Commit 7fda20f1 authored by Ingo Molnar's avatar Ingo Molnar
Browse files
Options

x86: spinlock ops are always-inlined 

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d93c870b
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
include/asm-x86/spinlock.h
View file @ 7fda20f1
...@@ -78,7 +78,7 @@ static inline int __raw_spin_is_contended(raw_spinlock_t *lock) ...@@ -78,7 +78,7 @@ static inline int __raw_spin_is_contended(raw_spinlock_t *lock)
return (((tmp >> 8) & 0xff) - (tmp & 0xff)) > 1; return (((tmp >> 8) & 0xff) - (tmp & 0xff)) > 1;
} }
static inline void __raw_spin_lock(raw_spinlock_t *lock) static __always_inline void __raw_spin_lock(raw_spinlock_t *lock)
{ {
short inc = 0x0100; short inc = 0x0100;
...@@ -99,7 +99,7 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock) ...@@ -99,7 +99,7 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock)
#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock) #define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
static inline int __raw_spin_trylock(raw_spinlock_t *lock) static __always_inline int __raw_spin_trylock(raw_spinlock_t *lock)
{ {
int tmp; int tmp;
short new; short new;
...@@ -120,7 +120,7 @@ static inline int __raw_spin_trylock(raw_spinlock_t *lock) ...@@ -120,7 +120,7 @@ static inline int __raw_spin_trylock(raw_spinlock_t *lock)
return tmp; return tmp;
} }
static inline void __raw_spin_unlock(raw_spinlock_t *lock) static __always_inline void __raw_spin_unlock(raw_spinlock_t *lock)
{ {
asm volatile(UNLOCK_LOCK_PREFIX "incb %0" asm volatile(UNLOCK_LOCK_PREFIX "incb %0"
: "+m" (lock->slock) : "+m" (lock->slock)
...@@ -142,7 +142,7 @@ static inline int __raw_spin_is_contended(raw_spinlock_t *lock) ...@@ -142,7 +142,7 @@ static inline int __raw_spin_is_contended(raw_spinlock_t *lock)
return (((tmp >> 16) & 0xffff) - (tmp & 0xffff)) > 1; return (((tmp >> 16) & 0xffff) - (tmp & 0xffff)) > 1;
} }
static inline void __raw_spin_lock(raw_spinlock_t *lock) static __always_inline void __raw_spin_lock(raw_spinlock_t *lock)
{ {
int inc = 0x00010000; int inc = 0x00010000;
int tmp; int tmp;
...@@ -165,7 +165,7 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock) ...@@ -165,7 +165,7 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock)
#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock) #define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
static inline int __raw_spin_trylock(raw_spinlock_t *lock) static __always_inline int __raw_spin_trylock(raw_spinlock_t *lock)
{ {
int tmp; int tmp;
int new; int new;
...@@ -187,7 +187,7 @@ static inline int __raw_spin_trylock(raw_spinlock_t *lock) ...@@ -187,7 +187,7 @@ static inline int __raw_spin_trylock(raw_spinlock_t *lock)
return tmp; return tmp;
} }
static inline void __raw_spin_unlock(raw_spinlock_t *lock) static __always_inline void __raw_spin_unlock(raw_spinlock_t *lock)
{ {
asm volatile(UNLOCK_LOCK_PREFIX "incw %0" asm volatile(UNLOCK_LOCK_PREFIX "incw %0"
: "+m" (lock->slock) : "+m" (lock->slock)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7