diff options
-rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 56630189f2ee..29cf7b1890a6 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S | |||
@@ -613,8 +613,8 @@ machine_check_common: | |||
613 | STD_EXCEPTION_COMMON(0xb00, trap_0b, .unknown_exception) | 613 | STD_EXCEPTION_COMMON(0xb00, trap_0b, .unknown_exception) |
614 | STD_EXCEPTION_COMMON(0xd00, single_step, .single_step_exception) | 614 | STD_EXCEPTION_COMMON(0xd00, single_step, .single_step_exception) |
615 | STD_EXCEPTION_COMMON(0xe00, trap_0e, .unknown_exception) | 615 | STD_EXCEPTION_COMMON(0xe00, trap_0e, .unknown_exception) |
616 | STD_EXCEPTION_COMMON(0xe40, emulation_assist, .program_check_exception) | 616 | STD_EXCEPTION_COMMON(0xe40, emulation_assist, .program_check_exception) |
617 | STD_EXCEPTION_COMMON(0xe60, hmi_exception, .unknown_exception) | 617 | STD_EXCEPTION_COMMON(0xe60, hmi_exception, .unknown_exception) |
618 | STD_EXCEPTION_COMMON_ASYNC(0xf00, performance_monitor, .performance_monitor_exception) | 618 | STD_EXCEPTION_COMMON_ASYNC(0xf00, performance_monitor, .performance_monitor_exception) |
619 | STD_EXCEPTION_COMMON(0x1300, instruction_breakpoint, .instruction_breakpoint_exception) | 619 | STD_EXCEPTION_COMMON(0x1300, instruction_breakpoint, .instruction_breakpoint_exception) |
620 | STD_EXCEPTION_COMMON(0x1502, denorm, .unknown_exception) | 620 | STD_EXCEPTION_COMMON(0x1502, denorm, .unknown_exception) |
@@ -714,21 +714,21 @@ data_access_common: | |||
714 | ld r3,PACA_EXGEN+EX_DAR(r13) | 714 | ld r3,PACA_EXGEN+EX_DAR(r13) |
715 | lwz r4,PACA_EXGEN+EX_DSISR(r13) | 715 | lwz r4,PACA_EXGEN+EX_DSISR(r13) |
716 | li r5,0x300 | 716 | li r5,0x300 |
717 | b .do_hash_page /* Try to handle as hpte fault */ | 717 | b .do_hash_page /* Try to handle as hpte fault */ |
718 | 718 | ||
719 | .align 7 | 719 | .align 7 |
720 | .globl h_data_storage_common | 720 | .globl h_data_storage_common |
721 | h_data_storage_common: | 721 | h_data_storage_common: |
722 | mfspr r10,SPRN_HDAR | 722 | mfspr r10,SPRN_HDAR |
723 | std r10,PACA_EXGEN+EX_DAR(r13) | 723 | std r10,PACA_EXGEN+EX_DAR(r13) |
724 | mfspr r10,SPRN_HDSISR | 724 | mfspr r10,SPRN_HDSISR |
725 | stw r10,PACA_EXGEN+EX_DSISR(r13) | 725 | stw r10,PACA_EXGEN+EX_DSISR(r13) |
726 | EXCEPTION_PROLOG_COMMON(0xe00, PACA_EXGEN) | 726 | EXCEPTION_PROLOG_COMMON(0xe00, PACA_EXGEN) |
727 | bl .save_nvgprs | 727 | bl .save_nvgprs |
728 | DISABLE_INTS | 728 | DISABLE_INTS |
729 | addi r3,r1,STACK_FRAME_OVERHEAD | 729 | addi r3,r1,STACK_FRAME_OVERHEAD |
730 | bl .unknown_exception | 730 | bl .unknown_exception |
731 | b .ret_from_except | 731 | b .ret_from_except |
732 | 732 | ||
733 | .align 7 | 733 | .align 7 |
734 | .globl instruction_access_common | 734 | .globl instruction_access_common |
@@ -741,7 +741,7 @@ instruction_access_common: | |||
741 | li r5,0x400 | 741 | li r5,0x400 |
742 | b .do_hash_page /* Try to handle as hpte fault */ | 742 | b .do_hash_page /* Try to handle as hpte fault */ |
743 | 743 | ||
744 | STD_EXCEPTION_COMMON(0xe20, h_instr_storage, .unknown_exception) | 744 | STD_EXCEPTION_COMMON(0xe20, h_instr_storage, .unknown_exception) |
745 | 745 | ||
746 | /* | 746 | /* |
747 | * Here is the common SLB miss user that is used when going to virtual | 747 | * Here is the common SLB miss user that is used when going to virtual |
@@ -1164,7 +1164,7 @@ fwnmi_data_area: | |||
1164 | /* pseries and powernv need to keep the whole page from | 1164 | /* pseries and powernv need to keep the whole page from |
1165 | * 0x7000 to 0x8000 free for use by the firmware | 1165 | * 0x7000 to 0x8000 free for use by the firmware |
1166 | */ | 1166 | */ |
1167 | . = 0x8000 | 1167 | . = 0x8000 |
1168 | #endif /* defined(CONFIG_PPC_PSERIES) || defined(CONFIG_PPC_POWERNV) */ | 1168 | #endif /* defined(CONFIG_PPC_PSERIES) || defined(CONFIG_PPC_POWERNV) */ |
1169 | 1169 | ||
1170 | /* Space for CPU0's segment table */ | 1170 | /* Space for CPU0's segment table */ |