aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/mach-common
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-05-26 17:48:38 -0400
committerMike Frysinger <vapier@gentoo.org>2009-06-12 06:11:52 -0400
commit37082511f06108129bd5f96d625a6fae2d5a4ab4 (patch)
tree1d68784b8a08c04646034a31bb752073473af9b6 /arch/blackfin/mach-common
parent89ecd506917ba6e86ede072efbef6c69d01db4dd (diff)
Blackfin: fix command line corruption with DEBUG_DOUBLEFAULT
Commit 6b3087c6 (which introduced Blackfin SMP) broke command line passing when the DEBUG_DOUBLEFAULT config option was enabled. Switch the code to using a scratch register and not R7 which holds the command line. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/mach-common')
-rw-r--r--arch/blackfin/mach-common/head.S16
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/blackfin/mach-common/head.S b/arch/blackfin/mach-common/head.S
index 01d62ff3cd28..f826f6b9f917 100644
--- a/arch/blackfin/mach-common/head.S
+++ b/arch/blackfin/mach-common/head.S
@@ -124,25 +124,25 @@ ENTRY(__start)
124 * below 124 * below
125 */ 125 */
126 GET_PDA(p0, r0); 126 GET_PDA(p0, r0);
127 r7 = [p0 + PDA_RETX]; 127 r6 = [p0 + PDA_RETX];
128 p1.l = _init_saved_retx; 128 p1.l = _init_saved_retx;
129 p1.h = _init_saved_retx; 129 p1.h = _init_saved_retx;
130 [p1] = r7; 130 [p1] = r6;
131 131
132 r7 = [p0 + PDA_DCPLB]; 132 r6 = [p0 + PDA_DCPLB];
133 p1.l = _init_saved_dcplb_fault_addr; 133 p1.l = _init_saved_dcplb_fault_addr;
134 p1.h = _init_saved_dcplb_fault_addr; 134 p1.h = _init_saved_dcplb_fault_addr;
135 [p1] = r7; 135 [p1] = r6;
136 136
137 r7 = [p0 + PDA_ICPLB]; 137 r6 = [p0 + PDA_ICPLB];
138 p1.l = _init_saved_icplb_fault_addr; 138 p1.l = _init_saved_icplb_fault_addr;
139 p1.h = _init_saved_icplb_fault_addr; 139 p1.h = _init_saved_icplb_fault_addr;
140 [p1] = r7; 140 [p1] = r6;
141 141
142 r7 = [p0 + PDA_SEQSTAT]; 142 r6 = [p0 + PDA_SEQSTAT];
143 p1.l = _init_saved_seqstat; 143 p1.l = _init_saved_seqstat;
144 p1.h = _init_saved_seqstat; 144 p1.h = _init_saved_seqstat;
145 [p1] = r7; 145 [p1] = r6;
146#endif 146#endif
147 147
148 /* Initialize stack pointer */ 148 /* Initialize stack pointer */