summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorMiao Xie <miaox@cn.fujitsu.com>2008-08-20 16:37:38 -0700
committerIngo Molnar <mingo@elte.hu>2008-08-21 09:54:06 +0200
commit3c4fbe5e01d7e5309be5045e7ae0db20a049e6dc (patch)
tree550195cb1a2ed58bc343e9a4f54d773e8abd5f90 /include/linux
parent6a55617ed5d1aa62b850de2cf66f5ede2eef4825 (diff)
downloadlinux-stable-3c4fbe5e01d7e5309be5045e7ae0db20a049e6dc.tar.gz
linux-stable-3c4fbe5e01d7e5309be5045e7ae0db20a049e6dc.tar.bz2
linux-stable-3c4fbe5e01d7e5309be5045e7ae0db20a049e6dc.zip
nohz: fix wrong event handler after online an offlined cpu
On the tickless system(CONFIG_NO_HZ=y and CONFIG_HIGH_RES_TIMERS=n), after I made an offlined cpu online, I found this cpu's event handler was tick_handle_periodic, not tick_nohz_handler. After debuging, I found this bug was caused by the wrong tick mode. the tick mode is not changed to NOHZ_MODE_INACTIVE when the cpu is offline. This patch fixes this bug. Signed-off-by: Miao Xie <miaox@cn.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/tick.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/tick.h b/include/linux/tick.h
index d3c02695dc5d..8cf8cfe2cc97 100644
--- a/include/linux/tick.h
+++ b/include/linux/tick.h
@@ -74,10 +74,13 @@ extern struct tick_device *tick_get_device(int cpu);
extern int tick_init_highres(void);
extern int tick_program_event(ktime_t expires, int force);
extern void tick_setup_sched_timer(void);
+# endif
+
+# if defined CONFIG_NO_HZ || defined CONFIG_HIGH_RES_TIMERS
extern void tick_cancel_sched_timer(int cpu);
# else
static inline void tick_cancel_sched_timer(int cpu) { }
-# endif /* HIGHRES */
+# endif
# ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
extern struct tick_device *tick_get_broadcast_device(void);