Bläddra i källkod

Fix breakage of 8xx boards from recent commit.

This patch fixes the negative consequences for 8xx of the recent
"ppc4xx: Clean up 440 exceptions handling" commit.

Signed-off-by: Rafal Jaworowski <raj@semihalf.com>
Rafal Jaworowski 18 år sedan
förälder
incheckning
cc3023b9f9
2 ändrade filer med 7 tillägg och 1 borttagningar
  1. 6 0
      include/asm-ppc/processor.h
  2. 1 1
      include/ppc_asm.tmpl

+ 6 - 0
include/asm-ppc/processor.h

@@ -628,6 +628,12 @@
 #define MAS6	SPRN_MAS6
 #define MAS7	SPRN_MAS7
 
+#if defined(CONFIG_4xx) || defined(CONFIG_44x) || defined(CONFIG_MPC85xx)
+#define DAR_DEAR DEAR
+#else
+#define DAR_DEAR DAR
+#endif
+
 /* Device Control Registers */
 
 #define DCRN_BEAR	0x090	/* Bus Error Address Register */

+ 1 - 1
include/ppc_asm.tmpl

@@ -235,7 +235,7 @@
 	stw	r22,_CTR(r21);	\
 	mfspr	r20,XER;	\
 	stw	r20,_XER(r21);	\
-	mfspr	r20,DEAR;	\
+	mfspr	r20, DAR_DEAR;	\
 	stw	r20,_DAR(r21);	\
 	mfspr	r22,reg1;	\
 	mfspr	r23,reg2;	\