Merge commit 'kumar/kumar-next'

[linux-2.6] / arch / blackfin / mach-common / lock.S

diff --git a/arch/blackfin/mach-common/lock.S b/arch/blackfin/mach-common/lock.S
index 28b87fe9ce3c6f610ef610f134a4c29858629234..30b887e67dd6776def5ef53238ebe3fead7a6bbd 100644 (file)
--- a/arch/blackfin/mach-common/lock.S
+++ b/arch/blackfin/mach-common/lock.S
@@ -174,7 +174,7 @@ ENTRY(_cache_lock)
        CLI R3;
 
        R7 = [P1];
-       R2 = 0xFFFFFF87 (X);
+       R2 = ~(0x78) (X);       /* mask out ILOC */
        R7 = R7 & R2;
        R0 = R0 << 3;
        R7 = R0 | R7;