summaryrefslogtreecommitdiffstats
path: root/include/linux/timer.h
diff options
context:
space:
mode:
authorMaxime Ripard <maxime@cerno.tech>2022-06-08 19:11:27 +0200
committerMaxime Ripard <maxime@cerno.tech>2022-06-08 19:11:27 +0200
commit6e2b347d42e54282e4c6cfa08272db462b178f7f (patch)
tree7686345b2e24c406a57feffcad558484f9552366 /include/linux/timer.h
parente54a4424925a27ed94dff046db3ce5caf4b1e748 (diff)
parentf2906aa863381afb0015a9eb7fefad885d4e5a56 (diff)
downloadcachepc-linux-6e2b347d42e54282e4c6cfa08272db462b178f7f.tar.gz
cachepc-linux-6e2b347d42e54282e4c6cfa08272db462b178f7f.zip
Merge v5.19-rc1 into drm-misc-fixes
Let's kick-off the start of the 5.19 fix cycle Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'include/linux/timer.h')
-rw-r--r--include/linux/timer.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h
index fda13c9d1256..648f00105f58 100644
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -196,14 +196,6 @@ extern void init_timers(void);
struct hrtimer;
extern enum hrtimer_restart it_real_fn(struct hrtimer *);
-#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON)
-struct ctl_table;
-
-extern unsigned int sysctl_timer_migration;
-int timer_migration_handler(struct ctl_table *table, int write,
- void *buffer, size_t *lenp, loff_t *ppos);
-#endif
-
unsigned long __round_jiffies(unsigned long j, int cpu);
unsigned long __round_jiffies_relative(unsigned long j, int cpu);
unsigned long round_jiffies(unsigned long j);