Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752729AbZJQJ6L (ORCPT ); Sat, 17 Oct 2009 05:58:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752720AbZJQJ6K (ORCPT ); Sat, 17 Oct 2009 05:58:10 -0400 Received: from hera.kernel.org ([140.211.167.34]:40333 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750826AbZJQJ6I (ORCPT ); Sat, 17 Oct 2009 05:58:08 -0400 Date: Sat, 17 Oct 2009 09:57:30 GMT From: tip-bot for Masami Hiramatsu Cc: linux-kernel@vger.kernel.org, ananth@in.ibm.com, hpa@zytor.com, mingo@redhat.com, fweisbec@gmail.com, tglx@linutronix.de, mhiramat@redhat.com, mingo@elte.hu Reply-To: mingo@redhat.com, hpa@zytor.com, ananth@in.ibm.com, linux-kernel@vger.kernel.org, fweisbec@gmail.com, tglx@linutronix.de, mhiramat@redhat.com, mingo@elte.hu In-Reply-To: <20090827172318.8246.53702.stgit@localhost.localdomain> References: <20090827172318.8246.53702.stgit@localhost.localdomain> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/probes] kprobes: Fix to add __kprobes to notify_die Message-ID: Git-Commit-ID: 8f270083587a4cb70fa14f0e2fd698eb08a4dd07 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]); Sat, 17 Oct 2009 09:57:31 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1569 Lines: 40 Commit-ID: 8f270083587a4cb70fa14f0e2fd698eb08a4dd07 Gitweb: http://git.kernel.org/tip/8f270083587a4cb70fa14f0e2fd698eb08a4dd07 Author: Masami Hiramatsu AuthorDate: Thu, 27 Aug 2009 13:23:18 -0400 Committer: Frederic Weisbecker CommitDate: Sun, 30 Aug 2009 03:08:26 +0200 kprobes: Fix to add __kprobes to notify_die Add __kprobes to notify_die() because do_int3() calls notify_die() instead of atomic_notify_call_chain() which is already marked as __kprobes. Signed-off-by: Masami Hiramatsu Acked-by: Ananth N Mavinakayanahalli Cc: Ingo Molnar LKML-Reference: <20090827172318.8246.53702.stgit@localhost.localdomain> Signed-off-by: Frederic Weisbecker --- kernel/notifier.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/notifier.c b/kernel/notifier.c index 61d5aa5..acd24e7 100644 --- a/kernel/notifier.c +++ b/kernel/notifier.c @@ -558,7 +558,7 @@ EXPORT_SYMBOL(unregister_reboot_notifier); static ATOMIC_NOTIFIER_HEAD(die_chain); -int notrace notify_die(enum die_val val, const char *str, +int notrace __kprobes notify_die(enum die_val val, const char *str, struct pt_regs *regs, long err, int trap, int sig) { struct die_args args = { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/