diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 16:39:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 16:39:23 -0800 |
| commit | 71ca44dac4cbf89ce88e460a293cc25c5b18fa50 (patch) | |
| tree | 199c54ee6ecfbdda0bf035df0257bbd278b97531 /include/asm-ia64/kprobes.h | |
| parent | 2c6f2db13a2428aa16f54f50232a589ddd5d7d01 (diff) | |
| parent | 9dad6f5785a9f113dbbd58951d2f5ef9abd06dcc (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] fix ia64 kprobes compilation
[IA64] move gcc_intrin.h from header-y to unifdef-y
[IA64] workaround tiger ia64_sal_get_physical_id_info hang
[IA64] move defconfig to arch/ia64/configs/
[IA64] Fix irq migration in multiple vector domain
[IA64] signal(ia64_ia32): add a signal stack overflow check
[IA64] signal(ia64): add a signal stack overflow check
[IA64] CONFIG_SGI_SN2 - auto select NUMA and ACPI_NUMA
Diffstat (limited to 'include/asm-ia64/kprobes.h')
| -rw-r--r-- | include/asm-ia64/kprobes.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-ia64/kprobes.h b/include/asm-ia64/kprobes.h index adbaba14eb0a..8233b3a964c6 100644 --- a/include/asm-ia64/kprobes.h +++ b/include/asm-ia64/kprobes.h @@ -121,10 +121,6 @@ extern int kprobes_fault_handler(struct pt_regs *regs, int trapnr); extern int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val, void *data); -/* ia64 does not need this */ -static inline void jprobe_return(void) -{ -} extern void invalidate_stacked_regs(void); extern void flush_register_stack(void); extern void arch_remove_kprobe(struct kprobe *p); |