diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2020-11-10 18:39:04 +0100 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2020-11-10 18:39:04 +0100 |
| commit | 12fa97c64dce2f3c2e6eed5dc618bb9046e40bf0 (patch) | |
| tree | ab8c2f7728b8fa678fdbca80d5e0206edf3a51bc /lib/smp_processor_id.c | |
| parent | b6d37a764a5b852db63101b3f2db0e699574b903 (diff) | |
| parent | c777d847107e80df24dae87fc9cf4b4c0bf4dfed (diff) | |
Merge branch 'sched/migrate-disable'
Diffstat (limited to 'lib/smp_processor_id.c')
| -rw-r--r-- | lib/smp_processor_id.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c index 525222e4f409..faaa927ac2c8 100644 --- a/lib/smp_processor_id.c +++ b/lib/smp_processor_id.c @@ -26,6 +26,11 @@ unsigned int check_preemption_disabled(const char *what1, const char *what2) if (current->nr_cpus_allowed == 1) goto out; +#if defined(CONFIG_SMP) && defined(CONFIG_PREEMPT_RT) + if (current->migration_disabled) + goto out; +#endif + /* * It is valid to assume CPU-locality during early bootup: */ |