Skip to content

Commit 84c041c

Browse files
tkhaigregkh
authored andcommitted
sparc64: Fix ITLB handler of null page
[ Upstream commit 1c2696cdaad84580545a2e9c0879ff597880b1a9 ] 1)Use kvmap_itlb_longpath instead of kvmap_dtlb_longpath. 2)Handle page #0 only, don't handle page #1: bleu -> blu (KERNBASE is 0x400000, so #1 does not exist too. But everything is possible in the future. Fix to not to have problems later.) 3)Remove unused kvmap_itlb_nonlinear. Signed-off-by: Kirill Tkhai <[email protected]> CC: David Miller <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 74e8a9e commit 84c041c

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

arch/sparc/kernel/ktlb.S

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@ kvmap_itlb:
2525
*/
2626
kvmap_itlb_4v:
2727

28-
kvmap_itlb_nonlinear:
2928
/* Catch kernel NULL pointer calls. */
3029
sethi %hi(PAGE_SIZE), %g5
3130
cmp %g4, %g5
32-
bleu,pn %xcc, kvmap_dtlb_longpath
31+
blu,pn %xcc, kvmap_itlb_longpath
3332
nop
3433

3534
KERN_TSB_LOOKUP_TL1(%g4, %g6, %g5, %g1, %g2, %g3, kvmap_itlb_load)

0 commit comments

Comments
 (0)