openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc: Simplify do_sigbus 

Exit out early for a kernel fault, avoiding indenting of
most of the function.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Anton Blanchard 2014-09-24 16:59:56 +10:00 committed by Michael Ellerman
parent e35735b9a5
commit 63af52629a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/mm/fault.c
View File

@ -120,7 +120,9 @@ static int do_sigbus(struct pt_regs *regs, unsigned long address)
up_read(&current->mm->mmap_sem); up_read(&current->mm->mmap_sem);
if (user_mode(regs)) { if (!user_mode(regs))
return MM_FAULT_ERR(SIGBUS);
current->thread.trap_nr = BUS_ADRERR; current->thread.trap_nr = BUS_ADRERR;
info.si_signo = SIGBUS; info.si_signo = SIGBUS;
info.si_errno = 0; info.si_errno = 0;
@ -128,8 +130,6 @@ static int do_sigbus(struct pt_regs *regs, unsigned long address)
info.si_addr = (void __user *)address; info.si_addr = (void __user *)address;
force_sig_info(SIGBUS, &info, current); force_sig_info(SIGBUS, &info, current);
return MM_FAULT_RETURN; return MM_FAULT_RETURN;
}
return MM_FAULT_ERR(SIGBUS);
} }
static int mm_fault_error(struct pt_regs *regs, unsigned long addr, int fault) static int mm_fault_error(struct pt_regs *regs, unsigned long addr, int fault)