Commit 09c7e8b2 authored Jul 26, 2019 by Thomas Gleixner Committed by Ingo Molnar Jul 31, 2019

x86/kvm: Use CONFIG_PREEMPTION



CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by
CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same
functionality which today depends on CONFIG_PREEMPT.

Switch the conditional for async pagefaults to use CONFIG_PREEMPTION.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Paul E. McKenney <paulmck@linux.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/20190726212124.789755413@linutronix.de


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent cb376c26

arch/x86/kernel/kvm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -314,7 +314,7 @@ static void kvm_guest_cpu_init(void)
		if (kvm_para_has_feature(KVM_FEATURE_ASYNC_PF) && kvmapf) {
		u64 pa = slow_virt_to_phys(this_cpu_ptr(&apf_reason));

		#ifdef CONFIG_PREEMPT
		#ifdef CONFIG_PREEMPTION
		pa \|= KVM_ASYNC_PF_SEND_ALWAYS;
		#endif
		pa \|= KVM_ASYNC_PF_ENABLED;

Admin message