mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 11:19:37 +00:00
powerpc/mm: Move out definition of CPU specific is_write bits
Define a common page_fault_is_write() helper and use it Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
parent
b4c001dc44
commit
41b464e5e5
1 changed files with 11 additions and 7 deletions
|
@ -182,6 +182,16 @@ static int mm_fault_error(struct pt_regs *regs, unsigned long addr, int fault)
|
|||
return MM_FAULT_CONTINUE;
|
||||
}
|
||||
|
||||
/*
|
||||
* Define the correct "is_write" bit in error_code based
|
||||
* on the processor family
|
||||
*/
|
||||
#if (defined(CONFIG_4xx) || defined(CONFIG_BOOKE))
|
||||
#define page_fault_is_write(__err) ((__err) & ESR_DST)
|
||||
#else
|
||||
#define page_fault_is_write(__err) ((__err) & DSISR_ISSTORE)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* For 600- and 800-family processors, the error_code parameter is DSISR
|
||||
* for a data fault, SRR1 for an instruction fault. For 400-family processors
|
||||
|
@ -202,18 +212,12 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address,
|
|||
struct mm_struct *mm = current->mm;
|
||||
unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
|
||||
int code = SEGV_MAPERR;
|
||||
int is_write = 0;
|
||||
int is_exec = TRAP(regs) == 0x400;
|
||||
int is_user = user_mode(regs);
|
||||
int is_write = page_fault_is_write(error_code);
|
||||
int fault;
|
||||
int rc = 0, store_update_sp = 0;
|
||||
|
||||
#if !(defined(CONFIG_4xx) || defined(CONFIG_BOOKE))
|
||||
is_write = error_code & DSISR_ISSTORE;
|
||||
#else
|
||||
is_write = error_code & ESR_DST;
|
||||
#endif /* CONFIG_4xx || CONFIG_BOOKE */
|
||||
|
||||
#ifdef CONFIG_PPC_ICSWX
|
||||
/*
|
||||
* we need to do this early because this "data storage
|
||||
|
|
Loading…
Reference in a new issue