diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-06-23 10:07:34 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-06-23 10:07:34 -0400 |
| commit | 1240e6b5532358257c52351639a8d2382fe58f84 (patch) | |
| tree | 43d374ce976a41c6dcd12a70a51e0289093f8d07 /include/trace/ftrace.h | |
| parent | c9ff921abecda352e987a6aae169118a3fc9aa5d (diff) | |
| parent | a5c7d797dcce3be5e77cd6ea62cc4920ededc32b (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'include/trace/ftrace.h')
| -rw-r--r-- | include/trace/ftrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index 3d685d1f2a03..5a64905d7278 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h | |||
| @@ -725,7 +725,7 @@ perf_trace_##call(void *__data, proto) \ | |||
| 725 | \ | 725 | \ |
| 726 | { assign; } \ | 726 | { assign; } \ |
| 727 | \ | 727 | \ |
| 728 | head = per_cpu_ptr(event_call->perf_events, smp_processor_id());\ | 728 | head = this_cpu_ptr(event_call->perf_events); \ |
| 729 | perf_trace_buf_submit(entry, __entry_size, rctx, __addr, \ | 729 | perf_trace_buf_submit(entry, __entry_size, rctx, __addr, \ |
| 730 | __count, &__regs, head); \ | 730 | __count, &__regs, head); \ |
| 731 | } | 731 | } |