From 27c5e64b095baed364ecc997870f6f6e983b14d5 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Wed, 23 Apr 2008 19:15:59 -0700 Subject: [PATCH] --- yaml --- r: 91979 b: refs/heads/master c: c6ca978370c57422cdcf814af1da96cfc7c24811 h: refs/heads/master i: 91977: ce3c6ba820274fc9183510e222d361851e388bb6 91975: dfad2f2f264b09e628bf76f7eb17f57a92e493c0 v: v3 --- [refs] | 2 +- trunk/arch/sparc64/kernel/entry.S | 2 +- trunk/arch/sparc64/kernel/sparc64_ksyms.c | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 99608cbb5ed5..cafd2cff38db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5c564279854c971a27cc650be4bb32c290e9ae7 +refs/heads/master: c6ca978370c57422cdcf814af1da96cfc7c24811 diff --git a/trunk/arch/sparc64/kernel/entry.S b/trunk/arch/sparc64/kernel/entry.S index fb43c76bdc26..f54cd2dd55dc 100644 --- a/trunk/arch/sparc64/kernel/entry.S +++ b/trunk/arch/sparc64/kernel/entry.S @@ -1559,7 +1559,7 @@ linux_sparc_syscall32: /* Linux native system calls enter here... */ .align 32 - .globl linux_sparc_syscall, ret_sys_call + .globl linux_sparc_syscall linux_sparc_syscall: /* Direct access to user regs, much faster. */ cmp %g1, NR_SYSCALLS ! IEU1 Group diff --git a/trunk/arch/sparc64/kernel/sparc64_ksyms.c b/trunk/arch/sparc64/kernel/sparc64_ksyms.c index 38736460b8db..66336590e830 100644 --- a/trunk/arch/sparc64/kernel/sparc64_ksyms.c +++ b/trunk/arch/sparc64/kernel/sparc64_ksyms.c @@ -68,8 +68,6 @@ extern void *__memscan_zero(void *, size_t); extern void *__memscan_generic(void *, int, size_t); extern int __memcmp(const void *, const void *, __kernel_size_t); extern __kernel_size_t strlen(const char *); -extern void linux_sparc_syscall(void); -extern void rtrap(void); extern void show_regs(struct pt_regs *); extern void syscall_trace(struct pt_regs *, int); extern void sys_sigsuspend(void);