diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-15 19:06:19 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-15 19:06:19 +0200 |
| commit | 19035e5b5d1e3127b4925d86f6a77964f91f2c3c (patch) | |
| tree | c9e7e9073970176a5b0970da715cb6430c3c9069 /kernel/trace | |
| parent | Merge branch 'timers-for-linus-clockevents' of git://git.kernel.org/pub/scm/l... (diff) | |
| parent | timers: Logic to move non pinned timers (diff) | |
| download | linux-19035e5b5d1e3127b4925d86f6a77964f91f2c3c.tar.xz linux-19035e5b5d1e3127b4925d86f6a77964f91f2c3c.zip | |
Merge branch 'timers-for-linus-migration' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus-migration' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
timers: Logic to move non pinned timers
timers: /proc/sys sysctl hook to enable timer migration
timers: Identifying the existing pinned timers
timers: Framework for identifying pinned timers
timers: allow deferrable timers for intervals tv2-tv5 to be deferred
Fix up conflicts in kernel/sched.c and kernel/timer.c manually
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace_sysprof.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/trace_sysprof.c b/kernel/trace/trace_sysprof.c index e04b76cc238a..f6693969287d 100644 --- a/kernel/trace/trace_sysprof.c +++ b/kernel/trace/trace_sysprof.c @@ -203,7 +203,8 @@ static void start_stack_timer(void *unused) hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); hrtimer->function = stack_trace_timer_fn; - hrtimer_start(hrtimer, ns_to_ktime(sample_period), HRTIMER_MODE_REL); + hrtimer_start(hrtimer, ns_to_ktime(sample_period), + HRTIMER_MODE_REL_PINNED); } static void start_stack_timers(void) |