projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
arch
/
x86
/
include
/
asm
/
paravirt.h
diff --git
a/arch/x86/include/asm/paravirt.h
b/arch/x86/include/asm/paravirt.h
index a660eceaa2734643145936c1e5d971961f8925ab..e299287e8e3396d95b3169c5a9e9a1086e662a1a 100644
(file)
--- a/
arch/x86/include/asm/paravirt.h
+++ b/
arch/x86/include/asm/paravirt.h
@@
-1389,6
+1389,7
@@
static inline int __raw_spin_is_contended(struct raw_spinlock *lock)
{
return PVOP_CALL1(int, pv_lock_ops.spin_is_contended, lock);
}
+#define __raw_spin_is_contended __raw_spin_is_contended
static __always_inline void __raw_spin_lock(struct raw_spinlock *lock)
{