2 files changed, 21 insertions, 32 deletions

diff --git a/arch/blackfin/mach-common/head.S b/arch/blackfin/mach-common/head.S
index 76de5724c1e..8b4d9885440 100644
--- a/arch/blackfin/mach-common/head.S
+++ b/arch/blackfin/mach-common/head.S
@@ -85,37 +85,25 @@ ENTRY(__start)
         SSYNC;
 
         /* in case of double faults, save a few things */
-        p0.l = _init_retx;
-        p0.h = _init_retx;
-        R0 = RETX;
-        [P0] = R0;
-
+        p1.l = _initial_pda;
+        p1.h = _initial_pda;
+        r4 = RETX;
 #ifdef CONFIG_DEBUG_DOUBLEFAULT
         /* Only save these if we are storing them,
          * This happens here, since L1 gets clobbered
          * below
          */
         GET_PDA(p0, r0);
-        r5 = [p0 + PDA_DF_RETX];
-        p1.l = _init_saved_retx;
-        p1.h = _init_saved_retx;
-        [p1] = r5;
-
-        r5 = [p0 + PDA_DF_DCPLB];
-        p1.l = _init_saved_dcplb_fault_addr;
-        p1.h = _init_saved_dcplb_fault_addr;
-        [p1] = r5;
-
-        r5 = [p0 + PDA_DF_ICPLB];
-        p1.l = _init_saved_icplb_fault_addr;
-        p1.h = _init_saved_icplb_fault_addr;
-        [p1] = r5;
-
-        r5 = [p0 + PDA_DF_SEQSTAT];
-        p1.l = _init_saved_seqstat;
-        p1.h = _init_saved_seqstat;
-        [p1] = r5;
+        r0 = [p0 + PDA_DF_RETX];
+        r1 = [p0 + PDA_DF_DCPLB];
+        r2 = [p0 + PDA_DF_ICPLB];
+        r3 = [p0 + PDA_DF_SEQSTAT];
+        [p1 + PDA_INIT_DF_RETX] = r0;
+        [p1 + PDA_INIT_DF_DCPLB] = r1;
+        [p1 + PDA_INIT_DF_ICPLB] = r2;
+        [p1 + PDA_INIT_DF_SEQSTAT] = r3;
 #endif
+        [p1 + PDA_INIT_RETX] = r4;
 
         /* Initialize stack pointer */
         sp.l = _init_thread_union + THREAD_SIZE;
diff --git a/arch/blackfin/mach-common/smp.c b/arch/blackfin/mach-common/smp.c
index 35e7e1eb018..1c143a4de5f 100644
--- a/arch/blackfin/mach-common/smp.c
+++ b/arch/blackfin/mach-common/smp.c
@@ -45,9 +45,7 @@ struct corelock_slot corelock __attribute__ ((__section__(".l2.bss")));
 unsigned long blackfin_iflush_l1_entry[NR_CPUS];
 #endif
 
-void __cpuinitdata *init_retx_coreb, *init_saved_retx_coreb,
-        *init_saved_seqstat_coreb, *init_saved_icplb_fault_addr_coreb,
-        *init_saved_dcplb_fault_addr_coreb;
+struct blackfin_initial_pda __cpuinitdata initial_pda_coreb;
 
 #define BFIN_IPI_RESCHEDULE   0
 #define BFIN_IPI_CALL_FUNC    1
@@ -369,13 +367,16 @@ void __cpuinit secondary_start_kernel(void)
         if (_bfin_swrst & SWRST_DBL_FAULT_B) {
                 printk(KERN_EMERG "CoreB Recovering from DOUBLE FAULT event\n");
 #ifdef CONFIG_DEBUG_DOUBLEFAULT
-                printk(KERN_EMERG " While handling exception (EXCAUSE = 0x%x) at %pF\n",
-                        (int)init_saved_seqstat_coreb & SEQSTAT_EXCAUSE, init_saved_retx_coreb);
-                printk(KERN_NOTICE "   DCPLB_FAULT_ADDR: %pF\n", init_saved_dcplb_fault_addr_coreb);
-                printk(KERN_NOTICE "   ICPLB_FAULT_ADDR: %pF\n", init_saved_icplb_fault_addr_coreb);
+                printk(KERN_EMERG " While handling exception (EXCAUSE = %#x) at %pF\n",
+                        initial_pda_coreb.seqstat_doublefault & SEQSTAT_EXCAUSE,
+                        initial_pda_coreb.retx_doublefault);
+                printk(KERN_NOTICE "   DCPLB_FAULT_ADDR: %pF\n",
+                        initial_pda_coreb.dcplb_doublefault_addr);
+                printk(KERN_NOTICE "   ICPLB_FAULT_ADDR: %pF\n",
+                        initial_pda_coreb.icplb_doublefault_addr);
 #endif
                 printk(KERN_NOTICE " The instruction at %pF caused a double exception\n",
-                        init_retx_coreb);
+                        initial_pda_coreb.retx);
         }
 
         /*