1 files changed, 19 insertions, 3 deletions

diff --git a/arch/blackfin/mach-common/cplbmgr.S b/arch/blackfin/mach-common/cplbmgr.S
index faca1ab344d2..f5cf3accef37 100644
--- a/arch/blackfin/mach-common/cplbmgr.S
+++ b/arch/blackfin/mach-common/cplbmgr.S
@@ -190,7 +190,14 @@ ENTRY(_cplb_mgr)
         [P0 - 4] = R0;
         R0 = [P0 - 0x100];
         [P0-0x104] = R0;
-.Lie_move:P0+=4;
+.Lie_move:
+        P0+=4;
+
+        /* Clear ICPLB_DATA15, in case we don't find a replacement
+         * otherwise, we would have a duplicate entry, and will crash
+         */
+        R0 = 0;
+        [P0 - 4] = R0;
 
         /* We've made space in the ICPLB table, so that ICPLB15
          * is now free to be overwritten. Next, we have to determine
@@ -515,14 +522,23 @@ ENTRY(_cplb_mgr)
         R0 = [P0++];    /* move data */
         [P0 - 8] = R0;
         R0 = [P0-0x104] /* move address */
-.Lde_move: [P0-0x108] = R0;
+.Lde_move:
+         [P0-0x108] = R0;
+
+.Lde_moved:
+        NOP;
+
+        /* Clear DCPLB_DATA15, in case we don't find a replacement
+         * otherwise, we would have a duplicate entry, and will crash
+         */
+        R0 = 0;
+        [P0 - 0x4] = R0;
 
         /* We've now made space in DCPLB15 for the new CPLB to be
          * installed. The next stage is to locate a CPLB in the
          * config table that covers the faulting address.
          */
 
-.Lde_moved:NOP;
         R0 = I0;                /* Our faulting address */
 
         P2.L = _dpdt_table;