Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / x86 / kernel / kprobes / core.c

diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
index f72a47b602e208ce3c18c24f1f215e4e2a465674..c33b06f5faa4079bb87392d42dd232ad6a2fe5a1 100644 (file)
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
@@ -1028,18 +1028,10 @@ NOKPROBE_SYMBOL(kprobe_fault_handler);
 
 bool arch_within_kprobe_blacklist(unsigned long addr)
 {
-       bool is_in_entry_trampoline_section = false;
-
-#ifdef CONFIG_X86_64
-       is_in_entry_trampoline_section =
-               (addr >= (unsigned long)__entry_trampoline_start &&
-                addr < (unsigned long)__entry_trampoline_end);
-#endif
        return  (addr >= (unsigned long)__kprobes_text_start &&
                 addr < (unsigned long)__kprobes_text_end) ||
                (addr >= (unsigned long)__entry_text_start &&
-                addr < (unsigned long)__entry_text_end) ||
-               is_in_entry_trampoline_section;
+                addr < (unsigned long)__entry_text_end);
 }
 
 int __init arch_init_kprobes(void)