Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd60ab7a authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

signal/powerpc: Remove pkey parameter from __bad_area_nosemaphore 



Now that bad_key_fault_exception no longer calls __bad_area_nosemaphore
there is no reason for __bad_area_nosemaphore to handle pkeys.

Reviewed-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 8eb2ba25

arch/powerpc/mm/fault.c

+4 −5
Original line number Diff line number Diff line
@@ -103,8 +103,7 @@ static bool store_updates_sp(unsigned int inst) 
 */



static int

__bad_area_nosemaphore(struct pt_regs *regs, unsigned long address, int si_code,

		int pkey)

__bad_area_nosemaphore(struct pt_regs *regs, unsigned long address, int si_code)

{

	/*

	 * If we are in kernel mode, bail out with a SEGV, this will
@@ -114,14 +113,14 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long address, int si_code, 
	if (!user_mode(regs))

		return SIGSEGV;



	_exception_pkey(SIGSEGV, regs, si_code, address, pkey);

	_exception(SIGSEGV, regs, si_code, address);



	return 0;

}



static noinline int bad_area_nosemaphore(struct pt_regs *regs, unsigned long address)

{

	return __bad_area_nosemaphore(regs, address, SEGV_MAPERR, 0);

	return __bad_area_nosemaphore(regs, address, SEGV_MAPERR);

}



static int __bad_area(struct pt_regs *regs, unsigned long address, int si_code)
@@ -134,7 +133,7 @@ static int __bad_area(struct pt_regs *regs, unsigned long address, int si_code) 
	 */

	up_read(&mm->mmap_sem);



	return __bad_area_nosemaphore(regs, address, si_code, 0);

	return __bad_area_nosemaphore(regs, address, si_code);

}



static noinline int bad_area(struct pt_regs *regs, unsigned long address)