sparc32: fix sparse warning in fault_32.c

PATCH In review Sam Ravnborg 1 participant 1 message Apr 21, 2014 SPARC + UltraSPARC (sparc/sparc64)

Share & tools

Sam Ravnborg

author

2014-04-21 19:39 UTC #0 lore raw

PATCH 2/29 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 <[email protected]>

---
 arch/sparc/mm/fault_32.c |  5 ++---
 arch/sparc/mm/mm_32.h    | 10 ++++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

arch/sparc/mm/fault_32.c +2 -3

index 59dbd46..7751810 100644
@@ -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,

arch/sparc/mm/mm_32.h +10 -0

index 5703274..ee773e4 100644
@@ -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;

Signature · 1 line

1.8.3.1