diff options
| author | Tejun Heo <tj@kernel.org> | 2010-02-02 00:38:15 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-02-02 00:38:15 -0500 |
| commit | ab386128f20c44c458a90039ab1bdc265ac474c9 (patch) | |
| tree | 2ad188744922b1bb951fd10ff50dc04c83acce22 /arch/ia64/include/asm/kprobes.h | |
| parent | dbfc196a3cc1a2514ad0737a82f764de23bd65e6 (diff) | |
| parent | ab658321f32770b903a4426e2a6fae0392757755 (diff) | |
Merge branch 'master' into percpu
Diffstat (limited to 'arch/ia64/include/asm/kprobes.h')
| -rw-r--r-- | arch/ia64/include/asm/kprobes.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/ia64/include/asm/kprobes.h b/arch/ia64/include/asm/kprobes.h index dbf83fb28db3..d5505d6f2382 100644 --- a/arch/ia64/include/asm/kprobes.h +++ b/arch/ia64/include/asm/kprobes.h | |||
| @@ -103,11 +103,6 @@ typedef struct kprobe_opcode { | |||
| 103 | bundle_t bundle; | 103 | bundle_t bundle; |
| 104 | } kprobe_opcode_t; | 104 | } kprobe_opcode_t; |
| 105 | 105 | ||
| 106 | struct fnptr { | ||
| 107 | unsigned long ip; | ||
| 108 | unsigned long gp; | ||
| 109 | }; | ||
| 110 | |||
| 111 | /* Architecture specific copy of original instruction*/ | 106 | /* Architecture specific copy of original instruction*/ |
| 112 | struct arch_specific_insn { | 107 | struct arch_specific_insn { |
| 113 | /* copy of the instruction to be emulated */ | 108 | /* copy of the instruction to be emulated */ |