On Tue, 18 Sep 2018, Eric W. Biederman wrote: > After the previous cleanups to do_sigbus and and bad_area_nosemaphore > mm_fault_error no now longer uses it's pkey parameter. Therefore > remove the unused parameter. > > Signed-off-by: "Eric W. Biederman" <[email protected]>
Reviewed-by: Thomas Gleixner <[email protected]> > --- > arch/x86/mm/fault.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c > index 6886866c072d..7ba00519fa5d 100644 > --- a/arch/x86/mm/fault.c > +++ b/arch/x86/mm/fault.c > @@ -999,7 +999,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, > unsigned long address, > > static noinline void > mm_fault_error(struct pt_regs *regs, unsigned long error_code, > - unsigned long address, u32 *pkey, vm_fault_t fault) > + unsigned long address, vm_fault_t fault) > { > if (fatal_signal_pending(current) && !(error_code & X86_PF_USER)) { > no_context(regs, error_code, address, 0, 0); > @@ -1419,7 +1419,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long > error_code, > > up_read(&mm->mmap_sem); > if (unlikely(fault & VM_FAULT_ERROR)) { > - mm_fault_error(regs, error_code, address, &pkey, fault); > + mm_fault_error(regs, error_code, address, fault); > return; > } > > -- > 2.17.1 > >
