BackPup/Linux
1
0 Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-10-07 05:31:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

signal/powerpc: Remove pkey parameter from __bad_area_nosemaphore

Browse Source 
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: Stephen Rothwell <[email protected]>
Signed-off-by: "Eric W. Biederman" <[email protected]>
This commit is contained in:
Eric W. Biederman committed 2018-09-21 15:49:28 +02:00
1 parent 8eb2ba25e3
commit cd60ab7abb
1 file changed
+4 -5
Download Patch File Download Diff File Expand all files Collapse all files
arch/powerpc/mm/fault.c
+4 -5
View File
@@ -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)