diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-10-22 03:48:06 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-10-22 03:48:06 -0400 |
| commit | 268a3dcfea2077fca60d3715caa5c96f9b5e6ea7 (patch) | |
| tree | c2232774508424e677e27f296090a68c775e4669 /arch/powerpc | |
| parent | c4bd822e7b12a9008241d76db45b665f2fef180c (diff) | |
| parent | 592aa999d6a272856c9bfbdaac0cfba1bb37c24c (diff) | |
Merge branch 'timers/range-hrtimers' into v28-range-hrtimers-for-linus-v2
Conflicts:
kernel/time/tick-sched.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/oprofile/cell/spu_profiler.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/oprofile/cell/spu_profiler.c b/arch/powerpc/oprofile/cell/spu_profiler.c index 380d7e217531..02ffe060db51 100644 --- a/arch/powerpc/oprofile/cell/spu_profiler.c +++ b/arch/powerpc/oprofile/cell/spu_profiler.c | |||
| @@ -196,7 +196,7 @@ int start_spu_profiling(unsigned int cycles_reset) | |||
| 196 | pr_debug("timer resolution: %lu\n", TICK_NSEC); | 196 | pr_debug("timer resolution: %lu\n", TICK_NSEC); |
| 197 | kt = ktime_set(0, profiling_interval); | 197 | kt = ktime_set(0, profiling_interval); |
| 198 | hrtimer_init(&timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); | 198 | hrtimer_init(&timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); |
| 199 | timer.expires = kt; | 199 | hrtimer_set_expires(&timer, kt); |
| 200 | timer.function = profile_spus; | 200 | timer.function = profile_spus; |
| 201 | 201 | ||
| 202 | /* Allocate arrays for collecting SPU PC samples */ | 202 | /* Allocate arrays for collecting SPU PC samples */ |