Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

1 files changed, 3 insertions, 0 deletions

diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
index e948b28a5a9a..4558dd3918cf 100644
--- a/arch/x86/kernel/kprobes.c
+++ b/arch/x86/kernel/kprobes.c
@@ -193,6 +193,9 @@ static int __kprobes can_boost(kprobe_opcode_t *opcodes)
         kprobe_opcode_t opcode;
         kprobe_opcode_t *orig_opcodes = opcodes;
 
+        if (search_exception_tables(opcodes))
+                return 0;       /* Page fault may occur on this address. */
+
 retry:
         if (opcodes - orig_opcodes > MAX_INSN_SIZE - 1)
                 return 0;