From: Eric W. Biederman <ebiederm@xmission.com>
Date: Mon, 17 Sep 2018 22:22:46 +0000 (+0200)
Subject: signal/x86: Remove pkey parameter from mm_fault_error
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=25c102d803eacf4741a067384f2d15b35f410ff2;p=openwrt%2Fstaging%2Fblogic.git

signal/x86: Remove pkey parameter from mm_fault_error

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.

Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
---

diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 9ef1d413aaec..bc27595dd8c7 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -1000,7 +1000,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);
@@ -1420,7 +1420,7 @@ good_area:
 
 	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;
 	}