summaryrefslogtreecommitdiff
path: root/kernel
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 16:25:45 +0800
commit352b6418a2d14c754b41f23e0698f0006c914b95 (patch)
tree381768caaaa7dcaa97e24c51ca84830ecd9cca6e /kernel
parente5f8b2d71c3b617d2d5ce9568067b1458b47a517 (diff)
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>
Diffstat (limited to 'kernel')
-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 e67518256a5a..c9ce09addacd 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -358,6 +358,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);