diff options
Diffstat (limited to 'patches/preempt__Provide_preempt__nort_variants.patch')
-rw-r--r-- | patches/preempt__Provide_preempt__nort_variants.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/patches/preempt__Provide_preempt__nort_variants.patch b/patches/preempt__Provide_preempt__nort_variants.patch new file mode 100644 index 000000000000..fc7e65c345fe --- /dev/null +++ b/patches/preempt__Provide_preempt__nort_variants.patch @@ -0,0 +1,53 @@ +Subject: preempt: Provide preempt_*_(no)rt variants +From: Thomas Gleixner <tglx@linutronix.de> +Date: Fri Jul 24 12:38:56 2009 +0200 + +From: Thomas Gleixner <tglx@linutronix.de> + +RT needs a few preempt_disable/enable points which are not necessary +otherwise. Implement variants to avoid #ifdeffery. + +Signed-off-by: Thomas Gleixner <tglx@linutronix.de> + + + +--- + include/linux/preempt.h | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) +--- +diff --git a/include/linux/preempt.h b/include/linux/preempt.h +index 4d244e295e85..5ceac863e729 100644 +--- a/include/linux/preempt.h ++++ b/include/linux/preempt.h +@@ -188,7 +188,11 @@ do { \ + preempt_count_dec(); \ + } while (0) + +-#define preempt_enable_no_resched() sched_preempt_enable_no_resched() ++#ifdef CONFIG_PREEMPT_RT ++# define preempt_enable_no_resched() sched_preempt_enable_no_resched() ++#else ++# define preempt_enable_no_resched() preempt_enable() ++#endif + + #define preemptible() (preempt_count() == 0 && !irqs_disabled()) + +@@ -282,6 +286,18 @@ do { \ + set_preempt_need_resched(); \ + } while (0) + ++#ifdef CONFIG_PREEMPT_RT ++# define preempt_disable_rt() preempt_disable() ++# define preempt_enable_rt() preempt_enable() ++# define preempt_disable_nort() barrier() ++# define preempt_enable_nort() barrier() ++#else ++# define preempt_disable_rt() barrier() ++# define preempt_enable_rt() barrier() ++# define preempt_disable_nort() preempt_disable() ++# define preempt_enable_nort() preempt_enable() ++#endif ++ + #ifdef CONFIG_PREEMPT_NOTIFIERS + + struct preempt_notifier; |