On Thu, 24 Apr 2014, tip-bot for Masami Hiramatsu wrote: > Commit-ID: 9c54b6164eeb292a0eac86c6913bd8daaff35e62 > Gitweb: http://git.kernel.org/tip/9c54b6164eeb292a0eac86c6913bd8daaff35e62 > Author: Masami Hiramatsu <[email protected]> > AuthorDate: Thu, 17 Apr 2014 17:18:07 +0900 > Committer: Ingo Molnar <[email protected]> > CommitDate: Thu, 24 Apr 2014 10:03:02 +0200 > > kprobes, x86: Allow kprobes on text_poke/hw_breakpoint > > Allow kprobes on text_poke/hw_breakpoint because > those are not related to the critical int3-debug > recursive path of kprobes at this moment. > > Signed-off-by: Masami Hiramatsu <[email protected]> > Reviewed-by: Steven Rostedt <[email protected]> > Cc: Andrew Morton <[email protected]> > Cc: Borislav Petkov <[email protected]> > Cc: Fengguang Wu <[email protected]> > Cc: Jiri Kosina <[email protected]>
Reviewed-by: Jiri Kosina <[email protected]> > Cc: Oleg Nesterov <[email protected]> > Cc: Paul Gortmaker <[email protected]> > Link: > http://lkml.kernel.org/r/[email protected] > Signed-off-by: Ingo Molnar <[email protected]> > --- > arch/x86/kernel/alternative.c | 3 +-- > arch/x86/kernel/hw_breakpoint.c | 5 ++--- > 2 files changed, 3 insertions(+), 5 deletions(-) > > diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c > index df94598..703130f 100644 > --- a/arch/x86/kernel/alternative.c > +++ b/arch/x86/kernel/alternative.c > @@ -5,7 +5,6 @@ > #include <linux/mutex.h> > #include <linux/list.h> > #include <linux/stringify.h> > -#include <linux/kprobes.h> > #include <linux/mm.h> > #include <linux/vmalloc.h> > #include <linux/memory.h> > @@ -551,7 +550,7 @@ void *__init_or_module text_poke_early(void *addr, const > void *opcode, > * > * Note: Must be called under text_mutex. > */ > -void *__kprobes text_poke(void *addr, const void *opcode, size_t len) > +void *text_poke(void *addr, const void *opcode, size_t len) > { > unsigned long flags; > char *vaddr; > diff --git a/arch/x86/kernel/hw_breakpoint.c b/arch/x86/kernel/hw_breakpoint.c > index a67b47c..5f9cf20 100644 > --- a/arch/x86/kernel/hw_breakpoint.c > +++ b/arch/x86/kernel/hw_breakpoint.c > @@ -32,7 +32,6 @@ > #include <linux/irqflags.h> > #include <linux/notifier.h> > #include <linux/kallsyms.h> > -#include <linux/kprobes.h> > #include <linux/percpu.h> > #include <linux/kdebug.h> > #include <linux/kernel.h> > @@ -424,7 +423,7 @@ EXPORT_SYMBOL_GPL(hw_breakpoint_restore); > * NOTIFY_STOP returned for all other cases > * > */ > -static int __kprobes hw_breakpoint_handler(struct die_args *args) > +static int hw_breakpoint_handler(struct die_args *args) > { > int i, cpu, rc = NOTIFY_STOP; > struct perf_event *bp; > @@ -511,7 +510,7 @@ static int __kprobes hw_breakpoint_handler(struct > die_args *args) > /* > * Handle debug exception notifications. > */ > -int __kprobes hw_breakpoint_exceptions_notify( > +int hw_breakpoint_exceptions_notify( > struct notifier_block *unused, unsigned long val, void *data) > { > if (val != DIE_DEBUG) > -- Jiri Kosina SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
