diff options
author | Clark Williams <williams@redhat.com> | 2012-01-12 22:11:05 -0600 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-01-12 22:11:05 -0600 |
commit | 937f5e333d0b05638126f651135d3b8fd6b43665 (patch) | |
tree | 8c85f620680aca1496b8914288bb38ce11c320fc /arch/powerpc/kernel/time.c | |
parent | d76fe430665fac3f44ee88958713ecc524fd778d (diff) | |
parent | b8ed9e5b8c34dc9fb1882669e45b21e3d0194881 (diff) |
Merge commit 'v3.2.1' into rt-3.2.1-rt9v3.2.1-rt9
Diffstat (limited to 'arch/powerpc/kernel/time.c')
-rw-r--r-- | arch/powerpc/kernel/time.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index 522bb1dfc353..5db163c96751 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -889,6 +889,15 @@ static void __init clocksource_init(void) clock->name, clock->mult, clock->shift); } +void decrementer_check_overflow(void) +{ + u64 now = get_tb_or_rtc(); + struct decrementer_clock *decrementer = &__get_cpu_var(decrementers); + + if (now >= decrementer->next_tb) + set_dec(1); +} + static int decrementer_set_next_event(unsigned long evt, struct clock_event_device *dev) { |