Commit-ID: 8f270083587a4cb70fa14f0e2fd698eb08a4dd07 Gitweb: http://git.kernel.org/tip/8f270083587a4cb70fa14f0e2fd698eb08a4dd07 Author: Masami Hiramatsu <mhiramat@xxxxxxxxxx> AuthorDate: Thu, 27 Aug 2009 13:23:18 -0400 Committer: Frederic Weisbecker <fweisbec@xxxxxxxxx> 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 <mhiramat@xxxxxxxxxx> Acked-by: Ananth N Mavinakayanahalli <ananth@xxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> LKML-Reference: <20090827172318.8246.53702.stgit@xxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx> --- 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-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html