diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-23 21:00:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-23 21:00:21 -0800 |
| commit | 85b80ebfa4384b8ea30cc1af9617db30319a9ccd (patch) | |
| tree | d601c0faf36b0ca4cda607ecfec892c73ca41bc1 /arch/sparc64/kernel/kprobes.c | |
| parent | 038eb0ea04b245351be34b0ae76b55eee4603989 (diff) | |
| parent | 89c94f2f70d093f59b55d3ea8042d13889169346 (diff) | |
| download | kernel-crypto-85b80ebfa4384b8ea30cc1af9617db30319a9ccd.tar.gz kernel-crypto-85b80ebfa4384b8ea30cc1af9617db30319a9ccd.tar.xz kernel-crypto-85b80ebfa4384b8ea30cc1af9617db30319a9ccd.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: make IOMMU code respect the segment boundary limits
[SPARC64]: Fix cpu trampoline et al. mismatch warnings.
[SPARC64]: More sparse warning fixes in process.c
[SPARC64]: Fix sparse warning wrt. fault_in_user_windows.
[SPARC64]: Kill show_regs32().
[SPARC64]: Fix sparse warnings wrt. __show_regs().
[SPARC64]: Kill show_stackframe{,32}().
[SPARC64]: Fix sparse warnings wrt. machine_alt_power_off().
Diffstat (limited to 'arch/sparc64/kernel/kprobes.c')
| -rw-r--r-- | arch/sparc64/kernel/kprobes.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/kprobes.c b/arch/sparc64/kernel/kprobes.c index 34fc3ddd500..f43b5d75535 100644 --- a/arch/sparc64/kernel/kprobes.c +++ b/arch/sparc64/kernel/kprobes.c @@ -465,8 +465,6 @@ void __kprobes jprobe_return(void) extern void jprobe_return_trap_instruction(void); -extern void __show_regs(struct pt_regs * regs); - int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs) { u32 *addr = (u32 *) regs->tpc; |