diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2014-04-21 21:39:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-04-29 01:12:24 -0400 |
| commit | e1b2f134883718312ee30775ad077c2186eeaedc (patch) | |
| tree | b63347864c254c6b7d61d1335ad7c06656d58203 /arch/sparc/mm | |
| parent | ddb7417ea9d31b9ef34c28cfe9c31da3d18c376a (diff) | |
sparc32: fix sparse warning in fault_32.c
Fix following warning:
fault_32.c:38:24: error: symbol 'unhandled_fault' redeclared with different type - different modifiers
When this warning was fixed several new warnings popped up - fix them too.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/mm')
| -rw-r--r-- | arch/sparc/mm/fault_32.c | 5 | ||||
| -rw-r--r-- | arch/sparc/mm/mm_32.h | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c index 59dbd4645725..775181003fd8 100644 --- a/arch/sparc/mm/fault_32.c +++ b/arch/sparc/mm/fault_32.c @@ -30,10 +30,9 @@ #include <asm/traps.h> #include <asm/uaccess.h> -int show_unhandled_signals = 1; +#include "mm_32.h" -static void unhandled_fault(unsigned long, struct task_struct *, - struct pt_regs *) __attribute__ ((noreturn)); +int show_unhandled_signals = 1; static void __noreturn unhandled_fault(unsigned long address, struct task_struct *tsk, diff --git a/arch/sparc/mm/mm_32.h b/arch/sparc/mm/mm_32.h index 5703274ccf89..ee773e4cf057 100644 --- a/arch/sparc/mm/mm_32.h +++ b/arch/sparc/mm/mm_32.h @@ -1,3 +1,13 @@ +/* fault_32.c - visible as they are called from assembler */ +asmlinkage int lookup_fault(unsigned long pc, unsigned long ret_pc, + unsigned long address); +asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write, + unsigned long address); + +void window_overflow_fault(void); +void window_underflow_fault(unsigned long sp); +void window_ret_fault(struct pt_regs *regs); + /* srmmu.c */ extern char *srmmu_name; |