Merge branch 'tracing/core-v2' into tracing-for-linus

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / kprobes.c

diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
index 759095d53a06f9e2913663cfedff5f57dc773818..7b5169d2b00026272ed26874913c42ff315befb3 100644 (file)
--- a/arch/x86/kernel/kprobes.c
+++ b/arch/x86/kernel/kprobes.c
@@ -193,7 +193,7 @@ static int __kprobes can_boost(kprobe_opcode_t *opcodes)
        kprobe_opcode_t opcode;
        kprobe_opcode_t *orig_opcodes = opcodes;
 
-       if (search_exception_tables(opcodes))
+       if (search_exception_tables((unsigned long)opcodes))
                return 0;       /* Page fault may occur on this address. */
 
 retry: