X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Farch%2Fpowerpc%2Fmm%2Fslb_low.S;fp=kernel%2Farch%2Fpowerpc%2Fmm%2Fslb_low.S;h=4c48b487698cf4208618647d8038cc1a9d72e3aa;hb=52f993b8e89487ec9ee15a7fb4979e0f09a45b27;hp=736d18b3cefd3bd16e2d9ab7c34b56bb7f5e8a61;hpb=c189ccac5702322ed843fe17057035b7222a59b6;p=kvmfornfv.git

diff --git a/kernel/arch/powerpc/mm/slb_low.S b/kernel/arch/powerpc/mm/slb_low.S
index 736d18b3c..4c48b4876 100644
--- a/kernel/arch/powerpc/mm/slb_low.S
+++ b/kernel/arch/powerpc/mm/slb_low.S
@@ -113,7 +113,12 @@ BEGIN_FTR_SECTION
 END_MMU_FTR_SECTION_IFCLR(MMU_FTR_1T_SEGMENT)
 	b	slb_finish_load_1T
 
-0:
+0:	/*
+	 * For userspace addresses, make sure this is region 0.
+	 */
+	cmpdi	r9, 0
+	bne	8f
+
 	/* when using slices, we extract the psize off the slice bitmaps
 	 * and then we need to get the sllp encoding off the mmu_psize_defs
 	 * array.