diff options
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/include/asm/exceptions.h | 1 | ||||
| -rw-r--r-- | arch/microblaze/mm/fault.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/exceptions.h b/arch/microblaze/include/asm/exceptions.h index 23c0f71db8e3..e6a8ddea1dca 100644 --- a/arch/microblaze/include/asm/exceptions.h +++ b/arch/microblaze/include/asm/exceptions.h | |||
| @@ -67,6 +67,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type, | |||
| 67 | int fsr, int addr); | 67 | int fsr, int addr); |
| 68 | 68 | ||
| 69 | asmlinkage void sw_exception(struct pt_regs *regs); | 69 | asmlinkage void sw_exception(struct pt_regs *regs); |
| 70 | void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig); | ||
| 70 | 71 | ||
| 71 | void die(const char *str, struct pt_regs *fp, long err); | 72 | void die(const char *str, struct pt_regs *fp, long err); |
| 72 | void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr); | 73 | void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr); |
diff --git a/arch/microblaze/mm/fault.c b/arch/microblaze/mm/fault.c index 57bd2a09610c..ae97d2ccdc22 100644 --- a/arch/microblaze/mm/fault.c +++ b/arch/microblaze/mm/fault.c | |||
| @@ -48,7 +48,7 @@ static int store_updates_sp(struct pt_regs *regs) | |||
| 48 | { | 48 | { |
| 49 | unsigned int inst; | 49 | unsigned int inst; |
| 50 | 50 | ||
| 51 | if (get_user(inst, (unsigned int *)regs->pc)) | 51 | if (get_user(inst, (unsigned int __user *)regs->pc)) |
| 52 | return 0; | 52 | return 0; |
| 53 | /* check for 1 in the rD field */ | 53 | /* check for 1 in the rD field */ |
| 54 | if (((inst >> 21) & 0x1f) != 1) | 54 | if (((inst >> 21) & 0x1f) != 1) |