summaryrefslogtreecommitdiffstats
path: root/include/asm-ppc64
diff options
context:
space:
mode:
authorGreg KH2005-06-28 07:07:56 +0200
committerGreg Kroah-Hartman2005-06-28 07:07:56 +0200
commit8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb (patch)
treec43b6c2fdf1b68b66906a2de69446dcec0f9af6b /include/asm-ppc64
parent[PATCH] PCI: use the MCFG table to properly access pci devices (x86-64) (diff)
parent[PATCH] cfq build fix (diff)
downloadkernel-qcow2-linux-8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb.tar.gz
kernel-qcow2-linux-8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb.tar.xz
kernel-qcow2-linux-8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb.zip
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-ppc64')
-rw-r--r--include/asm-ppc64/kprobes.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-ppc64/kprobes.h b/include/asm-ppc64/kprobes.h
index 19b468bed059..0802919c3235 100644
--- a/include/asm-ppc64/kprobes.h
+++ b/include/asm-ppc64/kprobes.h
@@ -42,10 +42,13 @@ typedef unsigned int kprobe_opcode_t;
#define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)((func_descr_t *)pentry)
+#define ARCH_SUPPORTS_KRETPROBES
+void kretprobe_trampoline(void);
+
/* Architecture specific copy of original instruction */
struct arch_specific_insn {
/* copy of original instruction */
- kprobe_opcode_t insn[MAX_INSN_SIZE];
+ kprobe_opcode_t *insn;
};
#ifdef CONFIG_KPROBES