diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-09 23:05:24 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-09 23:05:24 +0200 |
| commit | cc67e88013bcc28454313d301996b171bc9e2fdd (patch) | |
| tree | 2ea1dd00fe06e895e54b88a70aefda0ea0fd151e /include/linux/kernel.h | |
| parent | 2d239d4a7ccccba62254f287862ea5b7014a267d (diff) | |
| parent | 6b27d3127c0512c57c02018f0bfb9d5ecdf457ae (diff) | |
| download | linux-next-cc67e88013bcc28454313d301996b171bc9e2fdd.tar.gz linux-next-cc67e88013bcc28454313d301996b171bc9e2fdd.zip | |
Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
# Conflicts:
# Documentation/scheduler/index.rst
# arch/arm64/configs/defconfig
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 24414c79e59a..4b11d1dc0a67 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -43,30 +43,10 @@ struct completion; struct user; #ifdef CONFIG_PREEMPT_VOLUNTARY_BUILD - extern int __cond_resched(void); # define might_resched() __cond_resched() - -#elif defined(CONFIG_PREEMPT_DYNAMIC) && defined(CONFIG_HAVE_PREEMPT_DYNAMIC_CALL) - -extern int __cond_resched(void); - -DECLARE_STATIC_CALL(might_resched, __cond_resched); - -static __always_inline void might_resched(void) -{ - static_call_mod(might_resched)(); -} - -#elif defined(CONFIG_PREEMPT_DYNAMIC) && defined(CONFIG_HAVE_PREEMPT_DYNAMIC_KEY) - -extern int dynamic_might_resched(void); -# define might_resched() dynamic_might_resched() - #else - # define might_resched() do { } while (0) - #endif /* CONFIG_PREEMPT_* */ #ifdef CONFIG_DEBUG_ATOMIC_SLEEP |