From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756689AbZHRIqf (ORCPT ); Tue, 18 Aug 2009 04:46:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753482AbZHRIqe (ORCPT ); Tue, 18 Aug 2009 04:46:34 -0400 Received: from hera.kernel.org ([140.211.167.34]:44662 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753134AbZHRIqd (ORCPT ); Tue, 18 Aug 2009 04:46:33 -0400 Date: Tue, 18 Aug 2009 08:45:54 GMT From: tip-bot for Ingo Molnar To: linux-tip-commits@vger.kernel.org Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, schwidefsky@de.ibm.com, lethal@linux-sh.org, fweisbec@gmail.com, rostedt@goodmis.org, heiko.carstens@de.ibm.com, tglx@linutronix.de, jbaron@redhat.com, mingo@elte.hu Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, schwidefsky@de.ibm.com, lethal@linux-sh.org, fweisbec@gmail.com, rostedt@goodmis.org, heiko.carstens@de.ibm.com, jbaron@redhat.com, tglx@linutronix.de, mingo@elte.hu In-Reply-To: References: Subject: [tip:tracing/core] [S390] ftrace: update system call tracer support Message-ID: Git-Commit-ID: a9008fd42b1c3c89f684d90bdfb9c2d05c7af119 X-Mailer: tip-git-log-daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (hera.kernel.org [127.0.0.1]); Tue, 18 Aug 2009 08:45:55 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: a9008fd42b1c3c89f684d90bdfb9c2d05c7af119 Gitweb: http://git.kernel.org/tip/a9008fd42b1c3c89f684d90bdfb9c2d05c7af119 Author: Ingo Molnar AuthorDate: Tue, 18 Aug 2009 10:41:57 +0200 Committer: Ingo Molnar CommitDate: Tue, 18 Aug 2009 10:41:49 +0200 [S390] ftrace: update system call tracer support Commit fb34a08c3 ("tracing: Add trace events for each syscall entry/exit") changed the lowlevel API to ftrace syscall tracing but did not update s390 which started making use of it recently. This broke the s390 build, as reported by Paul Mundt. Update the callbacks with the syscall number and the syscall return code values. This allows per syscall tracepoints, syscall argument enumeration /debug/tracing/events/syscalls/ and perfcounters support and integration on s390 too. Reported-by: Paul Mundt Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: Jason Baron Cc: Steven Rostedt Cc: Frederic Weisbecker LKML-Reference: Signed-off-by: Ingo Molnar --- arch/s390/kernel/ptrace.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c index 43acd73..05f57cd 100644 --- a/arch/s390/kernel/ptrace.c +++ b/arch/s390/kernel/ptrace.c @@ -662,7 +662,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs) } if (unlikely(test_thread_flag(TIF_SYSCALL_FTRACE))) - ftrace_syscall_enter(regs); + trace_syscall_enter(regs, regs->gprs[2]); if (unlikely(current->audit_context)) audit_syscall_entry(is_compat_task() ? @@ -680,7 +680,7 @@ asmlinkage void do_syscall_trace_exit(struct pt_regs *regs) regs->gprs[2]); if (unlikely(test_thread_flag(TIF_SYSCALL_FTRACE))) - ftrace_syscall_exit(regs); + trace_syscall_exit(regs, regs->gprs[2]); if (test_thread_flag(TIF_SYSCALL_TRACE)) tracehook_report_syscall_exit(regs, 0);