diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-05-07 13:10:32 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-05-07 13:10:32 -0400 |
| commit | 9204dcfbe16061f799068eeacff5dc68ad33e523 (patch) | |
| tree | d0b0d6b9a850527b6ddf756de8846023933a4f18 /runtime/time.c | |
| parent | 49628242c239feb617b838bb5d90488386645bd6 (diff) | |
| parent | 12603f28dc1abdfdff43c53b939ebb528382512e (diff) | |
| download | systemtap-steved-9204dcfbe16061f799068eeacff5dc68ad33e523.tar.gz systemtap-steved-9204dcfbe16061f799068eeacff5dc68ad33e523.tar.xz systemtap-steved-9204dcfbe16061f799068eeacff5dc68ad33e523.zip | |
Merge branch 'master' into pr6429-comp-unwindsyms
* master:
PR444886: add .../build/... to default debuginfo search path
More signal cleanup.
Fix problem handling SIG_CHLD
Cleanup signal handling for staprun.
PR6481: timer reset needs irqs reenabled
Made runtime/task_finder.c improvements.
PR6474: use position-independent-executable security c/ld-flags for stap* binaries
2008-05-01 William Cohen <wcohen@redhat.com>
add git commit summary guidelines
PR5648: Fix unaligned access warning on ia64.
PR6008: Increase the limitation of the buffer size to 4095MB.
PR5645: Fix sub-buffer size calculation and debug messages.
Diffstat (limited to 'runtime/time.c')
| -rw-r--r-- | runtime/time.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/runtime/time.c b/runtime/time.c index 52a2edbb..8a0b6fad 100644 --- a/runtime/time.c +++ b/runtime/time.c @@ -131,10 +131,13 @@ __stp_time_timer_callback(unsigned long val) time->base_cycles = cycles; write_sequnlock(&time->lock); + local_irq_restore(flags); + /* PR6481: reenable IRQs before resetting the timer. + XXX: The worst that can probably happen is that we get + two consecutive timer resets. */ + if (likely(stp_timer_reregister)) mod_timer(&time->timer, jiffies + 1); - - local_irq_restore(flags); } /* This is called as an IPI, with interrupts disabled. */ |