x86: paravirt spinlocks, !CONFIG_SMP build fixes

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 4 insertions, 0 deletions

diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
index bba4041bb7ff..6aa8aed06d54 100644
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
@@ -270,11 +270,13 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
 
 void __init paravirt_use_bytelocks(void)
 {
+#ifdef CONFIG_SMP
         pv_lock_ops.spin_is_locked = __byte_spin_is_locked;
         pv_lock_ops.spin_is_contended = __byte_spin_is_contended;
         pv_lock_ops.spin_lock = __byte_spin_lock;
         pv_lock_ops.spin_trylock = __byte_spin_trylock;
         pv_lock_ops.spin_unlock = __byte_spin_unlock;
+#endif
 }
 
 struct pv_info pv_info = {
@@ -461,12 +463,14 @@ struct pv_mmu_ops pv_mmu_ops = {
 };
 
 struct pv_lock_ops pv_lock_ops = {
+#ifdef CONFIG_SMP
         .spin_is_locked = __ticket_spin_is_locked,
         .spin_is_contended = __ticket_spin_is_contended,
 
         .spin_lock = __ticket_spin_lock,
         .spin_trylock = __ticket_spin_trylock,
         .spin_unlock = __ticket_spin_unlock,
+#endif
 };
 
 EXPORT_SYMBOL_GPL(pv_time_ops);