sched/rt, xen: Use CONFIG_PREEMPTION (d4a3dcbc) · Commits · 戴 / test

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 preempt anand xen-ops code over to use CONFIG_PREEMPTION. Signed-off-by:

Thomas Gleixner <tglx@linutronix.de> Signed-off-by:

Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by:

Thomas Gleixner <tglx@linutronix.de> Reviewed-by:

Juergen Gross <jgross@suse.com> Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stefano Stabellini <sstabellini@kernel.org> Cc: xen-devel@lists.xenproject.org Link: https://lore.kernel.org/r/20191015191821.11479-23-bigeasy@linutronix.de Signed-off-by:

Ingo Molnar <mingo@kernel.org>

drivers/xen/preempt.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@
		#include <linux/sched.h>
		#include <xen/xen-ops.h>

		#ifndef CONFIG_PREEMPT
		#ifndef CONFIG_PREEMPTION

		/*
		* Some hypercalls issued by the toolstack can take many 10s of
		@@ -37,4 +37,4 @@ asmlinkage __visible void xen_maybe_preempt_hcall(void)
		__this_cpu_write(xen_in_preemptible_hcall, true);
		}
		}
		#endif /* CONFIG_PREEMPT */
		#endif /* CONFIG_PREEMPTION */

include/xen/xen-ops.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -215,7 +215,7 @@ bool xen_running_on_version_or_later(unsigned int major, unsigned int minor);
		void xen_efi_runtime_setup(void);


		#ifdef CONFIG_PREEMPT
		#ifdef CONFIG_PREEMPTION

		static inline void xen_preemptible_hcall_begin(void)
		{
		@@ -239,6 +239,6 @@ static inline void xen_preemptible_hcall_end(void)
		__this_cpu_write(xen_in_preemptible_hcall, false);
		}

		#endif /* CONFIG_PREEMPT */
		#endif /* CONFIG_PREEMPTION */

		#endif /* INCLUDE_XEN_OPS_H */

Admin message