From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751814AbdJTMdL (ORCPT ); Fri, 20 Oct 2017 08:33:11 -0400 Received: from terminus.zytor.com ([65.50.211.136]:43693 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751472AbdJTMdJ (ORCPT ); Fri, 20 Oct 2017 08:33:09 -0400 Date: Fri, 20 Oct 2017 05:26:33 -0700 From: tip-bot for Masami Hiramatsu Message-ID: Cc: keescook@chromium.org, peterz@infradead.org, linux-kernel@vger.kernel.org, vyasevich@gmail.com, mhiramat@kernel.org, hpa@zytor.com, rostedt@goodmis.org, ast@kernel.org, davem@davemloft.net, ananth@linux.vnet.ibm.com, paulmck@linux.vnet.ibm.com, mingo@kernel.org, stephen@networkplumber.org, ian.mcdonald@jandi.co.nz, anil.s.keshavamurthy@intel.com, torvalds@linux-foundation.org, tglx@linutronix.de Reply-To: tglx@linutronix.de, torvalds@linux-foundation.org, stephen@networkplumber.org, anil.s.keshavamurthy@intel.com, ian.mcdonald@jandi.co.nz, mingo@kernel.org, paulmck@linux.vnet.ibm.com, ananth@linux.vnet.ibm.com, davem@davemloft.net, ast@kernel.org, rostedt@goodmis.org, hpa@zytor.com, mhiramat@kernel.org, vyasevich@gmail.com, peterz@infradead.org, linux-kernel@vger.kernel.org, keescook@chromium.org In-Reply-To: <150724531730.5014.6377596890962355763.stgit@devbox> References: <150724531730.5014.6377596890962355763.stgit@devbox> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] kprobes: Disable the jprobes test code Git-Commit-ID: 2c7d662e2647aa55fa56dc449b3878ac24e17adf 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: 2c7d662e2647aa55fa56dc449b3878ac24e17adf Gitweb: https://git.kernel.org/tip/2c7d662e2647aa55fa56dc449b3878ac24e17adf Author: Masami Hiramatsu AuthorDate: Fri, 6 Oct 2017 08:15:17 +0900 Committer: Ingo Molnar CommitDate: Fri, 20 Oct 2017 11:02:54 +0200 kprobes: Disable the jprobes test code Disable jprobes test code because jprobes are deprecated. This code will be completely removed when the jprobe code is removed. Signed-off-by: Masami Hiramatsu Cc: Alexei Starovoitov Cc: Ananth N Mavinakayanahalli Cc: Anil S Keshavamurthy Cc: David S . Miller Cc: Ian McDonald Cc: Kees Cook Cc: Linus Torvalds Cc: Paul E . McKenney Cc: Peter Zijlstra Cc: Stephen Hemminger Cc: Steven Rostedt Cc: Thomas Gleixner Cc: Vlad Yasevich Link: http://lkml.kernel.org/r/150724531730.5014.6377596890962355763.stgit@devbox Signed-off-by: Ingo Molnar --- kernel/test_kprobes.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/kernel/test_kprobes.c b/kernel/test_kprobes.c index 47106a1..dd53e35 100644 --- a/kernel/test_kprobes.c +++ b/kernel/test_kprobes.c @@ -22,7 +22,7 @@ #define div_factor 3 -static u32 rand1, preh_val, posth_val, jph_val; +static u32 rand1, preh_val, posth_val; static int errors, handler_errors, num_tests; static u32 (*target)(u32 value); static u32 (*target2)(u32 value); @@ -162,6 +162,9 @@ static int test_kprobes(void) } +#if 0 +static u32 jph_val; + static u32 j_kprobe_target(u32 value) { if (preemptible()) { @@ -239,6 +242,10 @@ static int test_jprobes(void) return 0; } +#else +#define test_jprobe() (0) +#define test_jprobes() (0) +#endif #ifdef CONFIG_KRETPROBES static u32 krph_val;