diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2020-02-22 05:27:47 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2020-02-22 05:27:47 +0300 |
| commit | 8eece07c011f88da0ccf4127fca9a4e4faaf58ae (patch) | |
| tree | f4cd731284fc654cdd7ddfab41b07e1599d8084b /include/linux/kernel.h | |
| parent | 732a0dee501f9a693c9a711730838129f4587041 (diff) | |
| parent | 4e139c7711633365ebb52fbb63905395522a8413 (diff) | |
| download | linux-8eece07c011f88da0ccf4127fca9a4e4faaf58ae.tar.xz | |
Merge tag 'sched-for-bpf-2020-02-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into bpf-next
Two migrate disable related stubs for BPF to base the RT patches on
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 0d9db2a14f44..9b7a8d74a9d6 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -257,6 +257,13 @@ extern void __cant_sleep(const char *file, int line, int preempt_offset); #define might_sleep_if(cond) do { if (cond) might_sleep(); } while (0) +#ifndef CONFIG_PREEMPT_RT +# define cant_migrate() cant_sleep() +#else + /* Placeholder for now */ +# define cant_migrate() do { } while (0) +#endif + /** * abs - return absolute value of an argument * @x: the value. If it is unsigned type, it is converted to signed type first. |