From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756611AbdKGLWl (ORCPT ); Tue, 7 Nov 2017 06:22:41 -0500 Received: from terminus.zytor.com ([65.50.211.136]:50457 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932970AbdKGLWh (ORCPT ); Tue, 7 Nov 2017 06:22:37 -0500 Date: Tue, 7 Nov 2017 03:15:14 -0800 From: tip-bot for Masami Hiramatsu Message-ID: Cc: tglx@linutronix.de, linux@armlinux.org.uk, wangnan0@huawei.com, arnd@arndb.de, linux-kernel@vger.kernel.org, sfr@canb.auug.org.au, mingo@kernel.org, broonie@kernel.org, torvalds@linux-foundation.org, hpa@zytor.com, tixy@linaro.org, mhiramat@kernel.org, peterz@infradead.org Reply-To: peterz@infradead.org, torvalds@linux-foundation.org, hpa@zytor.com, mhiramat@kernel.org, tixy@linaro.org, linux-kernel@vger.kernel.org, sfr@canb.auug.org.au, broonie@kernel.org, mingo@kernel.org, tglx@linutronix.de, arnd@arndb.de, linux@armlinux.org.uk, wangnan0@huawei.com In-Reply-To: <150976985182.2012.15495311380682779381.stgit@devbox> References: <150976985182.2012.15495311380682779381.stgit@devbox> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/kprobes] arm/kprobes: Fix kretprobe test to check correct counter Git-Commit-ID: 4650209b166789182657c8eb0612cecd5b54d591 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 4650209b166789182657c8eb0612cecd5b54d591 Gitweb: https://git.kernel.org/tip/4650209b166789182657c8eb0612cecd5b54d591 Author: Masami Hiramatsu AuthorDate: Sat, 4 Nov 2017 13:30:52 +0900 Committer: Ingo Molnar CommitDate: Tue, 7 Nov 2017 11:25:14 +0100 arm/kprobes: Fix kretprobe test to check correct counter test_kretprobe() uses jprobe_func_called at the last test, but it must check kretprobe_handler_called. Signed-off-by: Masami Hiramatsu Cc: Arnd Bergmann Cc: Jon Medhurst Cc: Linus Torvalds Cc: Mark Brown Cc: Peter Zijlstra Cc: Russell King Cc: Stephen Rothwell Cc: Thomas Gleixner Cc: Wang Nan Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/150976985182.2012.15495311380682779381.stgit@devbox Signed-off-by: Ingo Molnar --- arch/arm/probes/kprobes/test-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/probes/kprobes/test-core.c b/arch/arm/probes/kprobes/test-core.c index 1c98a87..9c3ceba 100644 --- a/arch/arm/probes/kprobes/test-core.c +++ b/arch/arm/probes/kprobes/test-core.c @@ -451,7 +451,7 @@ static int test_kretprobe(long (*func)(long, long)) } if (!call_test_func(func, false)) return -EINVAL; - if (jprobe_func_called == test_func_instance) { + if (kretprobe_handler_called == test_func_instance) { pr_err("FAIL: kretprobe called after unregistering\n"); return -EINVAL; }