diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-07-24 12:38:56 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@rostedt.homelinux.com> | 2013-05-20 13:45:41 -0400 |
| commit | a07a7eaab7c346b0d1edbbfda576b5059541bcd3 (patch) | |
| tree | 4c2a87db54568d894e478ab17543426087447906 /include | |
| parent | b7284f4a589aa1efdeab3e146fee09830c89a993 (diff) | |
preempt: Provide preempt_*_(no)rt variants
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/preempt.h | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/include/linux/preempt.h b/include/linux/preempt.h index 281f0ffbab67..d58f1585fef8 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h @@ -54,11 +54,15 @@ do { \ dec_preempt_count(); \ } while (0) -#define preempt_enable_no_resched() __preempt_enable_no_resched() +#ifndef CONFIG_PREEMPT_RT_BASE +# define preempt_enable_no_resched() __preempt_enable_no_resched() +#else +# define preempt_enable_no_resched() preempt_enable() +#endif #define preempt_enable() \ do { \ - preempt_enable_no_resched(); \ + __preempt_enable_no_resched(); \ barrier(); \ preempt_check_resched(); \ } while (0) @@ -110,6 +114,18 @@ do { \ #endif /* CONFIG_PREEMPT_COUNT */ +#ifdef CONFIG_PREEMPT_RT_FULL +# define preempt_disable_rt() preempt_disable() +# define preempt_enable_rt() preempt_enable() +# define preempt_disable_nort() do { } while (0) +# define preempt_enable_nort() do { } while (0) +#else +# define preempt_disable_rt() do { } while (0) +# define preempt_enable_rt() do { } while (0) +# define preempt_disable_nort() preempt_disable() +# define preempt_enable_nort() preempt_enable() +#endif + #ifdef CONFIG_PREEMPT_NOTIFIERS struct preempt_notifier; |