Skip to content

Commit

Permalink
sparc32: fix sparse warning in fault_32.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sam Ravnborg authored and David S. Miller committed Apr 29, 2014
1 parent ddb7417 commit e1b2f13
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
5 changes: 2 additions & 3 deletions arch/sparc/mm/fault_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 10 additions & 0 deletions arch/sparc/mm/mm_32.h
Original file line number Diff line number Diff line change
@@ -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;

Expand Down

0 comments on commit e1b2f13

Please sign in to comment.