diff options
Diffstat (limited to 'arch/powerpc/mm/tlb_low_64e.S')
-rw-r--r-- | arch/powerpc/mm/tlb_low_64e.S | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/powerpc/mm/tlb_low_64e.S b/arch/powerpc/mm/tlb_low_64e.S index 4ebb34bc01d6..dc4a5f385e41 100644 --- a/arch/powerpc/mm/tlb_low_64e.S +++ b/arch/powerpc/mm/tlb_low_64e.S | |||
@@ -553,24 +553,24 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_USE_TLBRSRV) | |||
553 | rldicl r11,r16,64-VPTE_PGD_SHIFT,64-PGD_INDEX_SIZE-3 | 553 | rldicl r11,r16,64-VPTE_PGD_SHIFT,64-PGD_INDEX_SIZE-3 |
554 | clrrdi r10,r11,3 | 554 | clrrdi r10,r11,3 |
555 | ldx r15,r10,r15 | 555 | ldx r15,r10,r15 |
556 | cmpldi cr0,r15,0 | 556 | cmpdi cr0,r15,0 |
557 | beq virt_page_table_tlb_miss_fault | 557 | bge virt_page_table_tlb_miss_fault |
558 | 558 | ||
559 | #ifndef CONFIG_PPC_64K_PAGES | 559 | #ifndef CONFIG_PPC_64K_PAGES |
560 | /* Get to PUD entry */ | 560 | /* Get to PUD entry */ |
561 | rldicl r11,r16,64-VPTE_PUD_SHIFT,64-PUD_INDEX_SIZE-3 | 561 | rldicl r11,r16,64-VPTE_PUD_SHIFT,64-PUD_INDEX_SIZE-3 |
562 | clrrdi r10,r11,3 | 562 | clrrdi r10,r11,3 |
563 | ldx r15,r10,r15 | 563 | ldx r15,r10,r15 |
564 | cmpldi cr0,r15,0 | 564 | cmpdi cr0,r15,0 |
565 | beq virt_page_table_tlb_miss_fault | 565 | bge virt_page_table_tlb_miss_fault |
566 | #endif /* CONFIG_PPC_64K_PAGES */ | 566 | #endif /* CONFIG_PPC_64K_PAGES */ |
567 | 567 | ||
568 | /* Get to PMD entry */ | 568 | /* Get to PMD entry */ |
569 | rldicl r11,r16,64-VPTE_PMD_SHIFT,64-PMD_INDEX_SIZE-3 | 569 | rldicl r11,r16,64-VPTE_PMD_SHIFT,64-PMD_INDEX_SIZE-3 |
570 | clrrdi r10,r11,3 | 570 | clrrdi r10,r11,3 |
571 | ldx r15,r10,r15 | 571 | ldx r15,r10,r15 |
572 | cmpldi cr0,r15,0 | 572 | cmpdi cr0,r15,0 |
573 | beq virt_page_table_tlb_miss_fault | 573 | bge virt_page_table_tlb_miss_fault |
574 | 574 | ||
575 | /* Ok, we're all right, we can now create a kernel translation for | 575 | /* Ok, we're all right, we can now create a kernel translation for |
576 | * a 4K or 64K page from r16 -> r15. | 576 | * a 4K or 64K page from r16 -> r15. |
@@ -802,24 +802,24 @@ htw_tlb_miss: | |||
802 | rldicl r11,r16,64-(PGDIR_SHIFT-3),64-PGD_INDEX_SIZE-3 | 802 | rldicl r11,r16,64-(PGDIR_SHIFT-3),64-PGD_INDEX_SIZE-3 |
803 | clrrdi r10,r11,3 | 803 | clrrdi r10,r11,3 |
804 | ldx r15,r10,r15 | 804 | ldx r15,r10,r15 |
805 | cmpldi cr0,r15,0 | 805 | cmpdi cr0,r15,0 |
806 | beq htw_tlb_miss_fault | 806 | bge htw_tlb_miss_fault |
807 | 807 | ||
808 | #ifndef CONFIG_PPC_64K_PAGES | 808 | #ifndef CONFIG_PPC_64K_PAGES |
809 | /* Get to PUD entry */ | 809 | /* Get to PUD entry */ |
810 | rldicl r11,r16,64-(PUD_SHIFT-3),64-PUD_INDEX_SIZE-3 | 810 | rldicl r11,r16,64-(PUD_SHIFT-3),64-PUD_INDEX_SIZE-3 |
811 | clrrdi r10,r11,3 | 811 | clrrdi r10,r11,3 |
812 | ldx r15,r10,r15 | 812 | ldx r15,r10,r15 |
813 | cmpldi cr0,r15,0 | 813 | cmpdi cr0,r15,0 |
814 | beq htw_tlb_miss_fault | 814 | bge htw_tlb_miss_fault |
815 | #endif /* CONFIG_PPC_64K_PAGES */ | 815 | #endif /* CONFIG_PPC_64K_PAGES */ |
816 | 816 | ||
817 | /* Get to PMD entry */ | 817 | /* Get to PMD entry */ |
818 | rldicl r11,r16,64-(PMD_SHIFT-3),64-PMD_INDEX_SIZE-3 | 818 | rldicl r11,r16,64-(PMD_SHIFT-3),64-PMD_INDEX_SIZE-3 |
819 | clrrdi r10,r11,3 | 819 | clrrdi r10,r11,3 |
820 | ldx r15,r10,r15 | 820 | ldx r15,r10,r15 |
821 | cmpldi cr0,r15,0 | 821 | cmpdi cr0,r15,0 |
822 | beq htw_tlb_miss_fault | 822 | bge htw_tlb_miss_fault |
823 | 823 | ||
824 | /* Ok, we're all right, we can now create an indirect entry for | 824 | /* Ok, we're all right, we can now create an indirect entry for |
825 | * a 1M or 256M page. | 825 | * a 1M or 256M page. |