diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-02-08 08:55:43 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-02-08 08:55:46 +0100 |
| commit | 6d3e0907b8b239d16720d144e2675ecf10d3bc3b (patch) | |
| tree | e0b0743b5f6f82b057cafc4f3687396a6e01a0b4 /arch/ia64/include/asm/kprobes.h | |
| parent | sched: Remove member rt_se from struct rt_rq (diff) | |
| parent | kernel/sched.c: Suppress unused var warning (diff) | |
| download | linux-6d3e0907b8b239d16720d144e2675ecf10d3bc3b.tar.xz linux-6d3e0907b8b239d16720d144e2675ecf10d3bc3b.zip | |
Merge branch 'sched/urgent' into sched/core
Merge reason: Merge dependent fix, update to latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 { bundle_t bundle; } kprobe_opcode_t; -struct fnptr { - unsigned long ip; - unsigned long gp; -}; - /* Architecture specific copy of original instruction*/ struct arch_specific_insn { /* copy of the instruction to be emulated */ |