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/hdsp' into for-linus
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
paravirt.h
diff --git
a/arch/x86/include/asm/paravirt.h
b/arch/x86/include/asm/paravirt.h
index
378e369
..
a53da00
100644
(file)
--- a/
arch/x86/include/asm/paravirt.h
+++ b/
arch/x86/include/asm/paravirt.h
@@
-1443,7
+1443,7
@@
u64 _paravirt_ident_64(u64);
#define paravirt_nop ((void *)_paravirt_nop)
-#if
def CONFIG_SMP
+#if
defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
static inline int __raw_spin_is_locked(struct raw_spinlock *lock)
{