diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-27 07:38:02 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-27 07:38:02 -0400 |
commit | 5292ae11babca23c3ff82593630d2d7eebc350a9 (patch) | |
tree | 30a6c8123b35686098f306ea39398b7621f42054 /arch/powerpc/oprofile/cell/spu_profiler.c | |
parent | b0f209898f1a177bd503d49215b8c6628797a81c (diff) | |
parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) |
Merge commit 'v2.6.28-rc2' into x86/uv
Diffstat (limited to 'arch/powerpc/oprofile/cell/spu_profiler.c')
-rw-r--r-- | arch/powerpc/oprofile/cell/spu_profiler.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/oprofile/cell/spu_profiler.c b/arch/powerpc/oprofile/cell/spu_profiler.c index 380d7e217531..dd499c3e9da7 100644 --- a/arch/powerpc/oprofile/cell/spu_profiler.c +++ b/arch/powerpc/oprofile/cell/spu_profiler.c | |||
@@ -23,12 +23,11 @@ | |||
23 | 23 | ||
24 | static u32 *samples; | 24 | static u32 *samples; |
25 | 25 | ||
26 | static int spu_prof_running; | 26 | int spu_prof_running; |
27 | static unsigned int profiling_interval; | 27 | static unsigned int profiling_interval; |
28 | 28 | ||
29 | #define NUM_SPU_BITS_TRBUF 16 | 29 | #define NUM_SPU_BITS_TRBUF 16 |
30 | #define SPUS_PER_TB_ENTRY 4 | 30 | #define SPUS_PER_TB_ENTRY 4 |
31 | #define SPUS_PER_NODE 8 | ||
32 | 31 | ||
33 | #define SPU_PC_MASK 0xFFFF | 32 | #define SPU_PC_MASK 0xFFFF |
34 | 33 | ||
@@ -196,7 +195,7 @@ int start_spu_profiling(unsigned int cycles_reset) | |||
196 | pr_debug("timer resolution: %lu\n", TICK_NSEC); | 195 | pr_debug("timer resolution: %lu\n", TICK_NSEC); |
197 | kt = ktime_set(0, profiling_interval); | 196 | kt = ktime_set(0, profiling_interval); |
198 | hrtimer_init(&timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); | 197 | hrtimer_init(&timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); |
199 | timer.expires = kt; | 198 | hrtimer_set_expires(&timer, kt); |
200 | timer.function = profile_spus; | 199 | timer.function = profile_spus; |
201 | 200 | ||
202 | /* Allocate arrays for collecting SPU PC samples */ | 201 | /* Allocate arrays for collecting SPU PC samples */ |
@@ -208,6 +207,7 @@ int start_spu_profiling(unsigned int cycles_reset) | |||
208 | 207 | ||
209 | spu_prof_running = 1; | 208 | spu_prof_running = 1; |
210 | hrtimer_start(&timer, kt, HRTIMER_MODE_REL); | 209 | hrtimer_start(&timer, kt, HRTIMER_MODE_REL); |
210 | schedule_delayed_work(&spu_work, DEFAULT_TIMER_EXPIRE); | ||
211 | 211 | ||
212 | return 0; | 212 | return 0; |
213 | } | 213 | } |