diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-07-19 09:55:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-07-19 09:55:00 +0200 |
| commit | 9bb15425c3bc82b501134ed7d998811dc0c05bf5 (patch) | |
| tree | e2e6059d117f530d0f4ae0df98fed30d62f4e902 /kernel | |
| parent | 5a9821321e0a61674fd5c4b5a9e95007d0e7e052 (diff) | |
| parent | 51b2c07b22261f19188d9a9071943d60a067481c (diff) | |
Merge branch 'x86/jumplabel' into perf/core
Upcoming kprobes patches rely on the int3 code-patching machinery introduced by:
fd4363fff3d9 x86: Introduce int3 (breakpoint)-based instruction patching
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kprobes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 6e33498d665..b58b490fa43 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -1709,7 +1709,7 @@ EXPORT_SYMBOL_GPL(unregister_kprobes); static struct notifier_block kprobe_exceptions_nb = { .notifier_call = kprobe_exceptions_notify, - .priority = 0x7fffffff /* we need to be notified first */ + .priority = 0x7ffffff0 /* High priority, but not first. */ }; unsigned long __weak arch_deref_entry_point(void *entry) |