diff options
| author |   Helge Deller <deller@gmx.de> | 2016-06-04 17:38:09 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2016-06-05 08:49:01 +0200 |
| commit | 58f1c654d13a42575d507ea61f6de0332a761e75 (patch) | |
| tree | 8af64060c1f89c9bff5d7aa2c594068293e457a1 | |
| parent | parisc: Fix pagefault crash in unaligned __get_user() call (diff) | |
| download | linux-dev-58f1c654d13a42575d507ea61f6de0332a761e75.tar.xz linux-dev-58f1c654d13a42575d507ea61f6de0332a761e75.zip | |
parisc: Move die_if_kernel() prototype into traps.h header
Signed-off-by: Helge Deller <deller@gmx.de>
| -rw-r--r-- | arch/parisc/include/asm/traps.h | 2 | ||||
| -rw-r--r-- | arch/parisc/kernel/unaligned.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/traps.h b/arch/parisc/include/asm/traps.h index 4736020ba5ea..5e953ab4530d 100644 --- a/arch/parisc/include/asm/traps.h +++ b/arch/parisc/include/asm/traps.h @@ -8,6 +8,8 @@ struct pt_regs; void parisc_terminate(char *msg, struct pt_regs *regs, int code, unsigned long offset) __noreturn __cold; +void die_if_kernel(char *str, struct pt_regs *regs, long err); + /* mm/fault.c */ void do_page_fault(struct pt_regs *regs, unsigned long code, unsigned long address); diff --git a/arch/parisc/kernel/unaligned.c b/arch/parisc/kernel/unaligned.c index 8d49614d600d..2b65c0177778 100644 --- a/arch/parisc/kernel/unaligned.c +++ b/arch/parisc/kernel/unaligned.c @@ -28,6 +28,7 @@ #include <linux/ratelimit.h> #include <asm/uaccess.h> #include <asm/hardirq.h> +#include <asm/traps.h> /* #define DEBUG_UNALIGNED 1 */ @@ -130,8 +131,6 @@ int unaligned_enabled __read_mostly = 1; -void die_if_kernel (char *str, struct pt_regs *regs, long err); - static int emulate_ldh(struct pt_regs *regs, int toreg) { unsigned long saddr = regs->ior; |