git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/asoc' into for-linus
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
spinlock.h
diff --git
a/arch/x86/include/asm/spinlock.h
b/arch/x86/include/asm/spinlock.h
index
e5e6caf
..
b7e5db8
100644
(file)
--- a/
arch/x86/include/asm/spinlock.h
+++ b/
arch/x86/include/asm/spinlock.h
@@
-172,7
+172,7
@@
static inline int __ticket_spin_is_contended(raw_spinlock_t *lock)
return (((tmp >> TICKET_SHIFT) - tmp) & ((1 << TICKET_SHIFT) - 1)) > 1;
}
return (((tmp >> TICKET_SHIFT) - tmp) & ((1 << TICKET_SHIFT) - 1)) > 1;
}
-#ifndef CONFIG_PARAVIRT
+#ifndef CONFIG_PARAVIRT
_SPINLOCKS
static inline int __raw_spin_is_locked(raw_spinlock_t *lock)
{
static inline int __raw_spin_is_locked(raw_spinlock_t *lock)
{
@@
-206,7
+206,7
@@
static __always_inline void __raw_spin_lock_flags(raw_spinlock_t *lock,
__raw_spin_lock(lock);
}
__raw_spin_lock(lock);
}
-#endif
+#endif
/* CONFIG_PARAVIRT_SPINLOCKS */
static inline void __raw_spin_unlock_wait(raw_spinlock_t *lock)
{
static inline void __raw_spin_unlock_wait(raw_spinlock_t *lock)
{