Skip to contentSkip to conversation

sparc64: Fix ITLB handler of null page

PATCH In review Kirill Tkhai 2 participants 2 messages Aug 2, 2013 – Aug 3, 2013 SPARC + UltraSPARC (sparc/sparc64)

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 sparc64: Fix ITLB handler of null page

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.

---
 arch/sparc/kernel/ktlb.S |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
arch/sparc/kernel/ktlb.S +1 -2
index 0746e5e..fde5a41 100644
@@ -25,11 +25,10 @@ kvmap_itlb:
 	 */
 kvmap_itlb_4v:
 
-kvmap_itlb_nonlinear:
 	/* Catch kernel NULL pointer calls.  */
 	sethi		%hi(PAGE_SIZE), %g5
 	cmp		%g4, %g5
-	bleu,pn		%xcc, kvmap_dtlb_longpath
+	blu,pn		%xcc, kvmap_itlb_longpath
 	 nop
 
 	KERN_TSB_LOOKUP_TL1(%g4, %g6, %g5, %g1, %g2, %g3, kvmap_itlb_load)
maintainer
#1 lore raw

From: Kirill Tkhai <[email protected]>
Date: Fri, 02 Aug 2013 19:23:18 +0400

Quoted 10 lines

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.

Looks good, applied, thanks.