aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhangwei(Jovi) <jovi.zhangwei@huawei.com>2013-07-29 09:33:58 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-04 15:43:32 +0800
commit197d436deff13594bcc97740147c5ed9e7fe7ddb (patch)
tree51861f7d6698cbe9aaee5953df5c4699e412e52a
parent95a9769291fda8caa8a98c0eabff769509a6e1ba (diff)
downloadkernel_samsung_tuna-197d436deff13594bcc97740147c5ed9e7fe7ddb.zip
kernel_samsung_tuna-197d436deff13594bcc97740147c5ed9e7fe7ddb.tar.gz
kernel_samsung_tuna-197d436deff13594bcc97740147c5ed9e7fe7ddb.tar.bz2
tracing: Fix irqs-off tag display in syscall tracing
commit 11034ae9c20f4057a6127fc965906417978e69b2 upstream Initialization of variable irq_flags and pc was missed when backport 11034ae9c to linux-3.0.y and linux-3.4.y, my fault. Signed-off-by: zhangwei(Jovi) <jovi.zhangwei@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--kernel/trace/trace_syscalls.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 9b7dad8..5819cd5 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -357,6 +357,9 @@ void ftrace_syscall_exit(void *ignore, struct pt_regs *regs, long ret)
if (!sys_data)
return;
+ local_save_flags(irq_flags);
+ pc = preempt_count();
+
event = trace_current_buffer_lock_reserve(&buffer,
sys_data->exit_event->event.type, sizeof(*entry),
irq_flags, pc);