diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 12:15:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 12:15:17 -0400 |
| commit | f3efbe582b5396d134024c03a5fa253f2a85d9a6 (patch) | |
| tree | e4e15b7567b82d24cb1e7327398286a2b88df04c /kernel/trace/trace_sysprof.c | |
| parent | 05d3ed0a1fe3ea05ab9f3b8d32576a0bc2e19660 (diff) | |
| parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff) | |
Merge branch 'linus' into x86/gart
Diffstat (limited to 'kernel/trace/trace_sysprof.c')
| -rw-r--r-- | kernel/trace/trace_sysprof.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_sysprof.c b/kernel/trace/trace_sysprof.c index 2301e1e7c606..bb948e52ce20 100644 --- a/kernel/trace/trace_sysprof.c +++ b/kernel/trace/trace_sysprof.c | |||
| @@ -161,7 +161,7 @@ static void timer_notify(struct pt_regs *regs, int cpu) | |||
| 161 | __trace_special(tr, data, 2, regs->ip, 0); | 161 | __trace_special(tr, data, 2, regs->ip, 0); |
| 162 | 162 | ||
| 163 | while (i < sample_max_depth) { | 163 | while (i < sample_max_depth) { |
| 164 | frame.next_fp = 0; | 164 | frame.next_fp = NULL; |
| 165 | frame.return_address = 0; | 165 | frame.return_address = 0; |
| 166 | if (!copy_stack_frame(fp, &frame)) | 166 | if (!copy_stack_frame(fp, &frame)) |
| 167 | break; | 167 | break; |