From 66a63af4989e0593f661c11fe30cdcb2c7503a01 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 1 Aug 2012 10:09:28 +0200 Subject: [PATCH] --- yaml --- r: 331453 b: refs/heads/master c: 1f26076084678d0edecc07aad7671d8140f97b91 h: refs/heads/master i: 331451: e68026eff990c77f5cd0a4affc78269193a9e9a9 v: v3 --- [refs] | 2 +- trunk/arch/microblaze/kernel/hw_exception_handler.S | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1fb48cdd1494..c972b22926a6 100644 --- 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 index 52b9feb98515..61b3a1fed46f 100644 --- 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 */