Context |
Check |
Description |
snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch powerpc/merge (91966823812efbd175f904599e5cf2a854b39809)
|
snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch powerpc/next (fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8)
|
snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch linus/master (280d542f6ffac0e6d65dc267f92191d509b13b64)
|
snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch powerpc/fixes (5c88a17e15795226b56d83f579cbb9b7a4864f79)
|
snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch linux-next (7a7fd0de4a9804299793e564a555a49c1fc924cb)
|
snowpatch_ozlabs/apply_patch |
fail
|
Failed to apply to any branch
|
@@ -962,12 +962,6 @@ storage_fault_common:
ld r14,PACA_EXGEN+EX_R14(r13)
ld r15,PACA_EXGEN+EX_R15(r13)
bl do_page_fault
- cmpdi r3,0
- bne- 1f
- b interrupt_return
- mr r4,r3
- addi r3,r1,STACK_FRAME_OVERHEAD
- bl __bad_page_fault
b interrupt_return
/*
@@ -552,11 +552,11 @@ static long __do_page_fault(struct pt_regs *regs)
if (likely(entry)) {
instruction_pointer_set(regs, extable_fixup(entry));
return 0;
- } else if (IS_ENABLED(CONFIG_PPC_BOOK3S_64)) {
+ } else if (IS_ENABLED(CONFIG_PPC64)) {
__bad_page_fault(regs, err);
return 0;
} else {
- /* 32 and 64e handle the bad page fault in asm */
+ /* 32-bit handles the bad page fault in asm */
return err;
}
}
With non-volatile registers saved on interrupt, bad_page_fault can now be called by do_page_fault. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- arch/powerpc/kernel/exceptions-64e.S | 6 ------ arch/powerpc/mm/fault.c | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-)