diff options
author | 2008-10-22 09:48:06 +0200 | |
---|---|---|
committer | 2008-10-22 09:48:06 +0200 | |
commit | 268a3dcfea2077fca60d3715caa5c96f9b5e6ea7 (patch) | |
tree | c2232774508424e677e27f296090a68c775e4669 /arch/powerpc | |
parent | NOHZ: fix thinko in the timer restart code path (diff) | |
parent | hrtimers: add missing docbook comments to struct hrtimer (diff) | |
download | linux-268a3dcfea2077fca60d3715caa5c96f9b5e6ea7.tar.gz linux-268a3dcfea2077fca60d3715caa5c96f9b5e6ea7.tar.bz2 linux-268a3dcfea2077fca60d3715caa5c96f9b5e6ea7.zip |
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) pr_debug("timer resolution: %lu\n", TICK_NSEC); kt = ktime_set(0, profiling_interval); hrtimer_init(&timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); - timer.expires = kt; + hrtimer_set_expires(&timer, kt); timer.function = profile_spus; /* Allocate arrays for collecting SPU PC samples */ |