diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-08 19:21:49 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-08 19:21:52 +0300 |
| commit | 86cb2ec7b22a0a89b8660110dc03321fadbef45f (patch) | |
| tree | c4162b0ab7c4e3602e2b7a6a6fd47c55c3315fea /kernel/time/tick-common.c | |
| parent | 7f0030b211579939461468f25b80c73e293c46e0 (diff) | |
| parent | a5abba989deceb731047425812d268daf7536575 (diff) | |
| download | linux-86cb2ec7b22a0a89b8660110dc03321fadbef45f.tar.xz | |
Merge commit 'v2.6.38-rc8' into perf/core
Merge reason: Merge latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/time/tick-common.c')
| -rw-r--r-- | kernel/time/tick-common.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c index 051bc80a0c43..ed228ef6f6b8 100644 --- a/kernel/time/tick-common.c +++ b/kernel/time/tick-common.c @@ -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(); } /* |