diff options
| author | Paul E. McKenney <paulmck@kernel.org> | 2022-07-21 17:46:18 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@kernel.org> | 2022-07-21 17:46:18 -0700 |
| commit | 34bc7b454dc31f75a0be7ee8ab378135523d7c51 (patch) | |
| tree | a1891ee085290746b6835e5e33e3c31cec2489fa /arch/arm/mach-imx | |
| parent | d38c8fe48354af9c7120291938574e1ebb221d52 (diff) | |
| parent | 1dcaa3b462265f688613163a1562a65ee53a3311 (diff) | |
| download | linux-stable-34bc7b454dc31f75a0be7ee8ab378135523d7c51.tar.gz linux-stable-34bc7b454dc31f75a0be7ee8ab378135523d7c51.tar.bz2 linux-stable-34bc7b454dc31f75a0be7ee8ab378135523d7c51.zip | |
Merge branch 'ctxt.2022.07.05a' into HEAD
ctxt.2022.07.05a: Linux-kernel memory model development branch.
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/cpuidle-imx6q.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/cpuidle-imx6q.c b/arch/arm/mach-imx/cpuidle-imx6q.c index 094337dc1bc7..d086cbae09c3 100644 --- a/arch/arm/mach-imx/cpuidle-imx6q.c +++ b/arch/arm/mach-imx/cpuidle-imx6q.c @@ -3,6 +3,7 @@ * Copyright (C) 2012 Freescale Semiconductor, Inc. */ +#include <linux/context_tracking.h> #include <linux/cpuidle.h> #include <linux/module.h> #include <asm/cpuidle.h> @@ -24,9 +25,9 @@ static int imx6q_enter_wait(struct cpuidle_device *dev, imx6_set_lpm(WAIT_UNCLOCKED); raw_spin_unlock(&cpuidle_lock); - rcu_idle_enter(); + ct_idle_enter(); cpu_do_idle(); - rcu_idle_exit(); + ct_idle_exit(); raw_spin_lock(&cpuidle_lock); if (num_idle_cpus-- == num_online_cpus()) |