Skip to content

Commit 33c5275

Browse files
chleroympe
authored andcommitted
powerpc/8xx: Inconditionally use task PGDIR in ITLB misses
Now that modules exec page tables are preallocated, the instruction TLBmiss handler can use task PGDIR inconditionally. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://msgid.link/774fd766a8b9bcb9173b5e677d5dad0df2d3970f.1724173828.git.christophe.leroy@csgroup.eu
1 parent 16a71c0 commit 33c5275

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

arch/powerpc/kernel/head_8xx.S

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -199,18 +199,7 @@ instruction_counter:
199199
mfspr r10, SPRN_SRR0 /* Get effective address of fault */
200200
INVALIDATE_ADJACENT_PAGES_CPU15(r10, r11)
201201
mtspr SPRN_MD_EPN, r10
202-
#ifdef CONFIG_EXECMEM
203-
mfcr r11
204-
compare_to_kernel_boundary r10, r10
205-
#endif
206202
mfspr r10, SPRN_M_TWB /* Get level 1 table */
207-
#ifdef CONFIG_EXECMEM
208-
blt+ 3f
209-
rlwinm r10, r10, 0, 20, 31
210-
oris r10, r10, (swapper_pg_dir - PAGE_OFFSET)@ha
211-
3:
212-
mtcr r11
213-
#endif
214203
lwz r11, (swapper_pg_dir-PAGE_OFFSET)@l(r10) /* Get level 1 entry */
215204
mtspr SPRN_MD_TWC, r11
216205
mfspr r10, SPRN_MD_TWC

0 commit comments

Comments
 (0)