aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/mm/fault.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/mm/fault.c')
-rw-r--r--arch/powerpc/mm/fault.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index b1ca7a0974e3..7c061313cc6f 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -156,7 +156,7 @@ static noinline int bad_access(struct pt_regs *regs, unsigned long address)
156} 156}
157 157
158static int do_sigbus(struct pt_regs *regs, unsigned long address, 158static int do_sigbus(struct pt_regs *regs, unsigned long address,
159 unsigned int fault) 159 vm_fault_t fault)
160{ 160{
161 siginfo_t info; 161 siginfo_t info;
162 unsigned int lsb = 0; 162 unsigned int lsb = 0;
@@ -187,7 +187,8 @@ static int do_sigbus(struct pt_regs *regs, unsigned long address,
187 return 0; 187 return 0;
188} 188}
189 189
190static int mm_fault_error(struct pt_regs *regs, unsigned long addr, int fault) 190static int mm_fault_error(struct pt_regs *regs, unsigned long addr,
191 vm_fault_t fault)
191{ 192{
192 /* 193 /*
193 * Kernel page fault interrupted by SIGKILL. We have no reason to 194 * Kernel page fault interrupted by SIGKILL. We have no reason to
@@ -415,7 +416,7 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address,
415 int is_exec = TRAP(regs) == 0x400; 416 int is_exec = TRAP(regs) == 0x400;
416 int is_user = user_mode(regs); 417 int is_user = user_mode(regs);
417 int is_write = page_fault_is_write(error_code); 418 int is_write = page_fault_is_write(error_code);
418 int fault, major = 0; 419 vm_fault_t fault, major = 0;
419 bool must_retry = false; 420 bool must_retry = false;
420 421
421 if (notify_page_fault(regs)) 422 if (notify_page_fault(regs))