imxmmc: fix crash when no platform data is provided

[safe/jmp/linux-2.6] / include / asm-powerpc / exception.h

diff --git a/include/asm-powerpc/exception.h b/include/asm-powerpc/exception.h
index d850c8e..329148b 100644 (file)
--- a/include/asm-powerpc/exception.h
+++ b/include/asm-powerpc/exception.h
@@ -228,18 +228,18 @@ label##_pSeries:                                                  \
 BEGIN_FW_FTR_SECTION;                          \
        stb     r11,PACAHARDIRQEN(r13);         \
 END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES);  \
+       TRACE_DISABLE_INTS;                     \
 BEGIN_FW_FTR_SECTION;                          \
        mfmsr   r10;                            \
        ori     r10,r10,MSR_EE;                 \
        mtmsrd  r10,1;                          \
 END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
-
 #else
 #define DISABLE_INTS                           \
        li      r11,0;                          \
        stb     r11,PACASOFTIRQEN(r13);         \
-       stb     r11,PACAHARDIRQEN(r13)
-
+       stb     r11,PACAHARDIRQEN(r13);         \
+       TRACE_DISABLE_INTS
 #endif /* CONFIG_PPC_ISERIES */
 
 #define ENABLE_INTS                            \
@@ -282,7 +282,9 @@ label##_common:                                             \
        EXCEPTION_PROLOG_COMMON(trap, PACA_EXGEN);      \
        FINISH_NAP;                                     \
        DISABLE_INTS;                                   \
+BEGIN_FTR_SECTION                                      \
        bl      .ppc64_runlatch_on;                     \
+END_FTR_SECTION_IFSET(CPU_FTR_CTRL)                    \
        addi    r3,r1,STACK_FRAME_OVERHEAD;             \
        bl      hdlr;                                   \
        b       .ret_from_except_lite