Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

locking/qspinlock/x86: Only emit the test-and-set fallback when building guest support

Only emit the test-and-set fallback for Hypervisors lacking
PARAVIRT_SPINLOCKS support when building for guests.

Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Cc: stable@vger.kernel.org # 4.2
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Peter Zijlstra and committed by
Ingo Molnar
a6b27785 43b3f028

+2 -1
+2 -1
arch/x86/include/asm/qspinlock.h
··· 39 39 } 40 40 #endif 41 41 42 + #ifdef CONFIG_PARAVIRT 42 43 #define virt_spin_lock virt_spin_lock 43 - 44 44 static inline bool virt_spin_lock(struct qspinlock *lock) 45 45 { 46 46 if (!static_cpu_has(X86_FEATURE_HYPERVISOR)) ··· 59 59 60 60 return true; 61 61 } 62 + #endif /* CONFIG_PARAVIRT */ 62 63 63 64 #include <asm-generic/qspinlock.h> 64 65