diff --git a/[refs] b/[refs] index 5ecec32ef572..3c5faea61e47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62c9295f9dd250ea1bb2c8078642a275a9ce82f8 +refs/heads/master: 8f270083587a4cb70fa14f0e2fd698eb08a4dd07 diff --git a/trunk/kernel/notifier.c b/trunk/kernel/notifier.c index 61d5aa5eced3..acd24e7643eb 100644 --- a/trunk/kernel/notifier.c +++ b/trunk/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 = {