timer fix
Linus,
Please pull the latest timers-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git timers-fixes-for-linus
Thanks,
Ingo
------------------>
Thomas Gleixner (1):
clockevents: Prevent oneshot mode when broadcast device is periodic
kernel/time/tick-broadcast.c | 10 ++++++++++ kernel/time/tick-common.c | 6 +++++- kernel/time/tick-internal.h | 3 +++ 3 files changed, 18 insertions(+), 1 deletions(-)
kernel/time/tick-broadcast.c +10 -0
@@ -600,4 +600,14 @@ int tick_broadcast_oneshot_active(void) return tick_broadcast_device.mode == TICKDEV_MODE_ONESHOT; } +/* +* Check whether the broadcast device supports oneshot. +*/ +bool tick_broadcast_oneshot_available (void ) +{ +struct clock_event_device *bc = tick_broadcast_device.evtdev; + +return bc ? bc->features &CLOCK_EVT_FEAT_ONESHOT : false; +} +#endif
kernel/time/tick-common.c +5 -1
@@ -51,7 +51,11 @@ int tick_is_oneshot_available(void) {struct clock_event_device *dev =__this_cpu_read (tick_cpu_device.evtdev); -return dev && (dev->features &CLOCK_EVT_FEAT_ONESHOT ); +if (!dev || !(dev->features &CLOCK_EVT_FEAT_ONESHOT )) +return 0 ; +if (!(dev->features &CLOCK_EVT_FEAT_C3STOP )) +return 1 ; +return tick_broadcast_oneshot_available (); }/*
kernel/time/tick-internal.h +3 -0
@@ -36,6 +36,7 @@ extern void tick_shutdown_broadcast_oneshot(unsigned int *cpup);extern int tick_resume_broadcast_oneshot (struct clock_event_device *bc);extern int tick_broadcast_oneshot_active (void );extern void tick_check_oneshot_broadcast (int cpu); +bool tick_broadcast_oneshot_available (void );# else /* BROADCAST */ static inline void tick_broadcast_setup_oneshot (struct clock_event_device *bc) {
@@ -46,6 +47,7 @@ static inline void tick_broadcast_switch_to_oneshot(void) { }static inline void tick_shutdown_broadcast_oneshot (unsigned int *cpup) { }static inline int tick_broadcast_oneshot_active (void ) {return 0 ; }static inline void tick_check_oneshot_broadcast (int cpu) { } +static inline bool tick_broadcast_oneshot_available (void ) {return true; }# endif /* !BROADCAST */ #else /* !ONESHOT */
@@ -76,6 +78,7 @@ static inline int tick_resume_broadcast_oneshot(struct clock_event_device *bc) return 0; }static inline int tick_broadcast_oneshot_active (void ) {return 0 ; } +static inline bool tick_broadcast_oneshot_available (void ) {return false; }#endif /* !TICK_ONESHOT */ /*