diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2011-08-11 13:14:58 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:38:17 (GMT) |
| commit | 7f751a4b1b96d1622b413400008d5a59f59cdc85 (patch) | |
| tree | 61e9d35a5fc747a99aaefefa775aca86e2da45b1 /include/linux/preempt.h | |
| parent | 852966311c98b98674d1c5c6fbbbbb28bd71d2cb (diff) | |
| download | linux-fsl-qoriq-7f751a4b1b96d1622b413400008d5a59f59cdc85.tar.xz | |
sched: Generic migrate_disable
Make migrate_disable() be a preempt_disable() for !rt kernels. This
allows generic code to use it but still enforces that these code
sections stay relatively small.
A preemptible migrate_disable() accessible for general use would allow
people growing arbitrary per-cpu crap instead of clean these things
up.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-275i87sl8e1jcamtchmehonm@git.kernel.org
Diffstat (limited to 'include/linux/preempt.h')
| -rw-r--r-- | include/linux/preempt.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/include/linux/preempt.h b/include/linux/preempt.h index f906def..116ac32 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h @@ -130,28 +130,25 @@ do { \ #endif /* CONFIG_PREEMPT_COUNT */ -#ifdef CONFIG_SMP -extern void migrate_disable(void); -extern void migrate_enable(void); -#else -# define migrate_disable() barrier() -# define migrate_enable() barrier() -#endif - #ifdef CONFIG_PREEMPT_RT_FULL # define preempt_disable_rt() preempt_disable() # define preempt_enable_rt() preempt_enable() # define preempt_disable_nort() barrier() # define preempt_enable_nort() barrier() -# define migrate_disable_rt() migrate_disable() -# define migrate_enable_rt() migrate_enable() +# ifdef CONFIG_SMP + extern void migrate_disable(void); + extern void migrate_enable(void); +# else /* CONFIG_SMP */ +# define migrate_disable() barrier() +# define migrate_enable() barrier() +# endif /* CONFIG_SMP */ #else # define preempt_disable_rt() barrier() # define preempt_enable_rt() barrier() # define preempt_disable_nort() preempt_disable() # define preempt_enable_nort() preempt_enable() -# define migrate_disable_rt() barrier() -# define migrate_enable_rt() barrier() +# define migrate_disable() preempt_disable() +# define migrate_enable() preempt_enable() #endif #ifdef CONFIG_PREEMPT_NOTIFIERS |