aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2014-04-21 15:39:17 -0400
committerDavid S. Miller <davem@davemloft.net>2014-04-29 01:12:24 -0400
commite1b2f134883718312ee30775ad077c2186eeaedc (patch)
treeb63347864c254c6b7d61d1335ad7c06656d58203
parentddb7417ea9d31b9ef34c28cfe9c31da3d18c376a (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>
-rw-r--r--arch/sparc/mm/fault_32.c5
-rw-r--r--arch/sparc/mm/mm_32.h10
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 @@
30#include <asm/traps.h> 30#include <asm/traps.h>
31#include <asm/uaccess.h> 31#include <asm/uaccess.h>
32 32
33int show_unhandled_signals = 1; 33#include "mm_32.h"
34 34
35static void unhandled_fault(unsigned long, struct task_struct *, 35int show_unhandled_signals = 1;
36 struct pt_regs *) __attribute__ ((noreturn));
37 36
38static void __noreturn unhandled_fault(unsigned long address, 37static void __noreturn unhandled_fault(unsigned long address,
39 struct task_struct *tsk, 38 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 @@
1/* fault_32.c - visible as they are called from assembler */
2asmlinkage int lookup_fault(unsigned long pc, unsigned long ret_pc,
3 unsigned long address);
4asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
5 unsigned long address);
6
7void window_overflow_fault(void);
8void window_underflow_fault(unsigned long sp);
9void window_ret_fault(struct pt_regs *regs);
10
1/* srmmu.c */ 11/* srmmu.c */
2extern char *srmmu_name; 12extern char *srmmu_name;
3 13