diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-05-20 20:37:23 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-05-20 20:37:23 +0200 |
| commit | f6304f5804f228b6c2fea9e3dfac25c5b2db9b38 (patch) | |
| tree | 362b9b6a3bd32b868e5917a32d448ac75c5854df /arch/x86/include/asm/kprobes.h | |
| parent | Merge branch 'for_2.6.35' of git://git.pwsan.com/linux-2.6 into omap-for-linus (diff) | |
| parent | omap4: Add support for i2c init (diff) | |
| download | linux-f6304f5804f228b6c2fea9e3dfac25c5b2db9b38.tar.xz linux-f6304f5804f228b6c2fea9e3dfac25c5b2db9b38.zip | |
Merge branch 'omap4-i2c-init' into omap-for-linus
Diffstat (limited to 'arch/x86/include/asm/kprobes.h')
| -rw-r--r-- | arch/x86/include/asm/kprobes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h index 4ffa345a8ccb..547882539157 100644 --- a/arch/x86/include/asm/kprobes.h +++ b/arch/x86/include/asm/kprobes.h @@ -24,6 +24,7 @@ #include <linux/types.h> #include <linux/ptrace.h> #include <linux/percpu.h> +#include <asm/insn.h> #define __ARCH_WANT_KPROBES_INSN_SLOT @@ -36,7 +37,6 @@ typedef u8 kprobe_opcode_t; #define RELATIVEJUMP_SIZE 5 #define RELATIVECALL_OPCODE 0xe8 #define RELATIVE_ADDR_SIZE 4 -#define MAX_INSN_SIZE 16 #define MAX_STACK_SIZE 64 #define MIN_STACK_SIZE(ADDR) \ (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \ |