From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753305AbdCOSpT (ORCPT ); Wed, 15 Mar 2017 14:45:19 -0400 Received: from terminus.zytor.com ([65.50.211.136]:39726 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751102AbdCOSow (ORCPT ); Wed, 15 Mar 2017 14:44:52 -0400 Date: Wed, 15 Mar 2017 11:44:40 -0700 From: "tip-bot for Naveen N. Rao" Message-ID: Cc: tglx@linutronix.de, mingo@kernel.org, acme@redhat.com, mhiramat@kernel.org, linux-kernel@vger.kernel.org, ananth@linux.vnet.ibm.com, hpa@zytor.com, naveen.n.rao@linux.vnet.ibm.com Reply-To: hpa@zytor.com, ananth@linux.vnet.ibm.com, naveen.n.rao@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org, acme@redhat.com, mhiramat@kernel.org In-Reply-To: <3f25bf400da5c222cd9b10eec6ded2d6b58209f8.1488991670.git.naveen.n.rao@linux.vnet.ibm.com> References: <3f25bf400da5c222cd9b10eec6ded2d6b58209f8.1488991670.git.naveen.n.rao@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] kprobes: Convert kprobe_exceptions_notify to use NOKPROBE_SYMBOL Git-Commit-ID: 5f6bee34707973ea7879a7857fd63ddccc92fff3 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: 5f6bee34707973ea7879a7857fd63ddccc92fff3 Gitweb: http://git.kernel.org/tip/5f6bee34707973ea7879a7857fd63ddccc92fff3 Author: Naveen N. Rao AuthorDate: Wed, 8 Mar 2017 22:34:15 +0530 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 14 Mar 2017 15:17:40 -0300 kprobes: Convert kprobe_exceptions_notify to use NOKPROBE_SYMBOL commit fc62d0207ae0 ("kprobes: Introduce weak variant of kprobe_exceptions_notify()") used the __kprobes annotation to exclude kprobe_exceptions_notify from being probed. Since NOKPROBE_SYMBOL() is a better way to do this enabling the symbol to be discovered as being blacklisted, change over to using NOKPROBE_SYMBOL(). Signed-off-by: Naveen N. Rao Acked-by: Masami Hiramatsu Cc: Ananth N Mavinakayanahalli Link: http://lkml.kernel.org/r/3f25bf400da5c222cd9b10eec6ded2d6b58209f8.1488991670.git.naveen.n.rao@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo --- kernel/kprobes.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 448759d..4780ec23 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -1740,11 +1740,12 @@ void unregister_kprobes(struct kprobe **kps, int num) } EXPORT_SYMBOL_GPL(unregister_kprobes); -int __weak __kprobes kprobe_exceptions_notify(struct notifier_block *self, - unsigned long val, void *data) +int __weak kprobe_exceptions_notify(struct notifier_block *self, + unsigned long val, void *data) { return NOTIFY_DONE; } +NOKPROBE_SYMBOL(kprobe_exceptions_notify); static struct notifier_block kprobe_exceptions_nb = { .notifier_call = kprobe_exceptions_notify,