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/hda' into for-linus
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
paravirt.c
diff --git
a/arch/x86/kernel/paravirt.c
b/arch/x86/kernel/paravirt.c
index
8e45f44
..
9faf43b
100644
(file)
--- a/
arch/x86/kernel/paravirt.c
+++ b/
arch/x86/kernel/paravirt.c
@@
-134,7
+134,9
@@
static void *get_call_destination(u8 type)
.pv_irq_ops = pv_irq_ops,
.pv_apic_ops = pv_apic_ops,
.pv_mmu_ops = pv_mmu_ops,
+#ifdef CONFIG_PARAVIRT_SPINLOCKS
.pv_lock_ops = pv_lock_ops,
+#endif
};
return *((void **)&tmpl + type);
}