diff options
| author | Adrian Bunk <bunk@kernel.org> | 2008-03-03 20:07:22 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-03-04 14:35:42 -0800 |
| commit | 9dad6f5785a9f113dbbd58951d2f5ef9abd06dcc (patch) | |
| tree | bed6cc599356679cd5eb4f201592c8348faa4f9b /arch/ia64 | |
| parent | 956d6cad87abdfaef35fa4fc2f2e4ac5bb4ee7a5 (diff) | |
| download | op-kernel-dev-9dad6f5785a9f113dbbd58951d2f5ef9abd06dcc.zip op-kernel-dev-9dad6f5785a9f113dbbd58951d2f5ef9abd06dcc.tar.gz | |
[IA64] fix ia64 kprobes compilation
This patch fixes the following compile error with a recent gcc:
CC kernel/kprobes.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/kprobes.c:1066: error: __ksymtab_jprobe_return causes a section type conflict
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/kprobes.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c index b618487..615c3d2 100644 --- a/arch/ia64/kernel/kprobes.c +++ b/arch/ia64/kernel/kprobes.c @@ -1001,6 +1001,11 @@ int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs) return 1; } +/* ia64 does not need this */ +void __kprobes jprobe_return(void) +{ +} + int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs) { struct kprobe_ctlblk *kcb = get_kprobe_ctlblk(); |
