aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2010-05-25 05:02:55 -0400
committerIngo Molnar <mingo@elte.hu>2010-05-25 05:28:49 -0400
commit87f44bbc246c5244c76a701f8eefba7788bce64a (patch)
tree1370af780bf3bae9e025766f5bbfa9418bb8b68b /kernel
parentd67f088e084755bdceb4f15bc6e05e309db1eea7 (diff)
perf, trace: Fix !x86 build bug
Patch b7e2ecef92 (perf, trace: Optimize tracepoints by removing IRQ-disable from perf/tracepoint interaction) made the unfortunate mistake of assuming the world is x86 only, correct this. The problem was that perf_fetch_caller_regs() did local_save_flags() into regs->flags, and I re-used that to remove another local_save_flags(), forgetting !x86 doesn't have regs->flags. Do the reverse, remove the local_save_flags() from perf_fetch_caller_regs() and let the ftrace site do the local_save_flags() instead. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Acked-by: Paul Mackerras <paulus@samba.org> Cc: acme@redhat.com Cc: efault@gmx.de Cc: fweisbec@gmail.com Cc: rostedt@goodmis.org LKML-Reference: <1274778175.5882.623.camel@twins> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace_event_perf.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c
index 26b8607a0abc..cb6f365016e4 100644
--- a/kernel/trace/trace_event_perf.c
+++ b/kernel/trace/trace_event_perf.c
@@ -157,6 +157,7 @@ __kprobes void *perf_trace_buf_prepare(int size, unsigned short type,
157 struct pt_regs *regs, int *rctxp) 157 struct pt_regs *regs, int *rctxp)
158{ 158{
159 struct trace_entry *entry; 159 struct trace_entry *entry;
160 unsigned long flags;
160 char *raw_data; 161 char *raw_data;
161 int pc; 162 int pc;
162 163
@@ -174,7 +175,8 @@ __kprobes void *perf_trace_buf_prepare(int size, unsigned short type,
174 memset(&raw_data[size - sizeof(u64)], 0, sizeof(u64)); 175 memset(&raw_data[size - sizeof(u64)], 0, sizeof(u64));
175 176
176 entry = (struct trace_entry *)raw_data; 177 entry = (struct trace_entry *)raw_data;
177 tracing_generic_entry_update(entry, regs->flags, pc); 178 local_save_flags(flags);
179 tracing_generic_entry_update(entry, flags, pc);
178 entry->type = type; 180 entry->type = type;
179 181
180 return raw_data; 182 return raw_data;