diff options
| author | Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | 2024-06-12 16:51:59 +0300 |
|---|---|---|
| committer | Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | 2024-06-12 16:52:39 +0300 |
| commit | 92815da4576a495cb6362cdfb132152fccc2222d (patch) | |
| tree | aab359ebf2ab210e9455b1d21d8298ceb81080c0 /include/linux/trace_recursion.h | |
| parent | aeacc39e2088a15ee31c8af4f68c84981fa08eb7 (diff) | |
| parent | 6b4468b0c6ba37a16795da567b58dc80bc7fb439 (diff) | |
Merge remote-tracking branch 'drm-misc/drm-misc-next' into HEAD
Merge drm-misc-next tree into the msm-next tree in order to be able to
use HDMI connector framework for the MSM HDMI driver.
Diffstat (limited to 'include/linux/trace_recursion.h')
| -rw-r--r-- | include/linux/trace_recursion.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/trace_recursion.h b/include/linux/trace_recursion.h index d48cd92d2364..24ea8ac049b4 100644 --- a/include/linux/trace_recursion.h +++ b/include/linux/trace_recursion.h @@ -135,7 +135,7 @@ extern void ftrace_record_recursion(unsigned long ip, unsigned long parent_ip); # define do_ftrace_record_recursion(ip, pip) do { } while (0) #endif -#ifdef CONFIG_ARCH_WANTS_NO_INSTR +#ifdef CONFIG_FTRACE_VALIDATE_RCU_IS_WATCHING # define trace_warn_on_no_rcu(ip) \ ({ \ bool __ret = !rcu_is_watching(); \ |