---

yaml --- r: 331453 b: refs/heads/master c: 1f26076 h: refs/heads/master i: 331451: e68026e v: v3
git-mirror · Oct 4, 2012 · 66a63af · 66a63af
1 parent 2b7db6b
commit 66a63af
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91836710c73497bdbd4eef966c560d178910400a
+refs/heads/master: 1f26076084678d0edecc07aad7671d8140f97b91
diff --git a/trunk/arch/microblaze/kernel/hw_exception_handler.S b/trunk/arch/microblaze/kernel/hw_exception_handler.S
@@ -615,7 +615,6 @@ ex_handler_done:
 		tophys(r5,r5)
 		BSRLI(r6,r3,PTE_SHIFT) /* Compute PTE address */
 		andi	r6, r6, PAGE_SIZE - 4
-		andi	r5, r5, PAGE_MASK + 0x3
 		or	r5, r5, r6
 		lwi	r4, r5, 0		/* Get Linux PTE */
 
@@ -717,7 +716,6 @@ ex_handler_done:
 		tophys(r5,r5)
 		BSRLI(r6,r3,PTE_SHIFT) /* Compute PTE address */
 		andi	r6, r6, PAGE_SIZE - 4
-		andi	r5, r5, PAGE_MASK + 0x3
 		or	r5, r5, r6
 		lwi	r4, r5, 0		/* Get Linux PTE */
 
@@ -789,7 +787,6 @@ ex_handler_done:
 		tophys(r5,r5)
 		BSRLI(r6,r3,PTE_SHIFT) /* Compute PTE address */
 		andi	r6, r6, PAGE_SIZE - 4
-		andi	r5, r5, PAGE_MASK + 0x3
 		or	r5, r5, r6
 		lwi	r4, r5, 0		/* Get Linux PTE */