Skip to content

Commit

Permalink
m68knommu: fix invalid flags on coldfire pit clocksource
Browse files Browse the repository at this point in the history
The m68knommu coldfire pit clocksource looks like it was incorrectly
marked as a continuous clocksource.  Running with it marked as a
continuous clocksource could cause hangs when the system switches to
highres mode or enables nohz.

This patch removes the CLOCK_SOURCE_IS_CONTINUOUS flag on the coldfire pit
clocksource.  This will disallow systems using this clocksource from
entering oneshot mode (disabling highres timers and nohz).

Signed-off-by: John Stultz <johnstul@us.ibm.com>
Acked-by: Greg Ungerer <gerg@snapgear.com>
Cc: Steven King <sfking@fdwdc.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
john stultz authored and Linus Torvalds committed Jan 16, 2010
1 parent 3018aa4 commit 355e8e8
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion arch/m68knommu/platform/coldfire/pit.c
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ static struct clocksource pit_clk = {
.read = pit_read_clk,
.shift = 20,
.mask = CLOCKSOURCE_MASK(32),
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};

/***************************************************************************/
Expand Down

0 comments on commit 355e8e8

Please sign in to comment.