powerpc/64s/exception: Make EXCEPTION_PROLOG_0 a gas macro for consistency with others

[linux-2.6-block.git] / arch / powerpc / include / asm / exception-64s.h

diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index a7b514574b80a0f1c13360abd6548958abd18816..663998e411e6927c5231ed6d6ff9d8c457bce064 100644 (file)
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -237,7 +237,7 @@
  */
 #define EXCEPTION_RELON_PROLOG(area, label, hsrr, kvm, vec)            \
        SET_SCRATCH0(r13);              /* save r13 */                  \
-       EXCEPTION_PROLOG_0(area);                                       \
+       EXCEPTION_PROLOG_0 area ;                                       \
        EXCEPTION_PROLOG_1 hsrr, area, kvm, vec, 0 ;                    \
        EXCEPTION_PROLOG_2_VIRT label, hsrr
 
@@ -301,13 +301,14 @@ BEGIN_FTR_SECTION_NESTED(943)                                             \
        std     ra,offset(r13);                                         \
 END_FTR_SECTION_NESTED(ftr,ftr,943)
 
-#define EXCEPTION_PROLOG_0(area)                                       \
-       GET_PACA(r13);                                                  \
-       std     r9,area+EX_R9(r13);     /* save r9 */                   \
-       OPT_GET_SPR(r9, SPRN_PPR, CPU_FTR_HAS_PPR);                     \
-       HMT_MEDIUM;                                                     \
-       std     r10,area+EX_R10(r13);   /* save r10 - r12 */            \
+.macro EXCEPTION_PROLOG_0 area
+       GET_PACA(r13)
+       std     r9,\area\()+EX_R9(r13)          /* save r9 */
+       OPT_GET_SPR(r9, SPRN_PPR, CPU_FTR_HAS_PPR)
+       HMT_MEDIUM
+       std     r10,\area\()+EX_R10(r13)        /* save r10 - r12 */
        OPT_GET_SPR(r10, SPRN_CFAR, CPU_FTR_CFAR)
+.endm
 
 .macro EXCEPTION_PROLOG_1 hsrr, area, kvm, vec, bitmask
        OPT_SAVE_REG_TO_PACA(\area\()+EX_PPR, r9, CPU_FTR_HAS_PPR)
@@ -352,7 +353,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
 
 #define EXCEPTION_PROLOG(area, label, hsrr, kvm, vec)                  \
        SET_SCRATCH0(r13);              /* save r13 */                  \
-       EXCEPTION_PROLOG_0(area);                                       \
+       EXCEPTION_PROLOG_0 area ;                                       \
        EXCEPTION_PROLOG_1 hsrr, area, kvm, vec, 0 ;                    \
        EXCEPTION_PROLOG_2_REAL label, hsrr, 1
 
@@ -421,7 +422,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
 
 /* Do not enable RI */
 #define EXCEPTION_PROLOG_NORI(area, label, hsrr, kvm, vec)             \
-       EXCEPTION_PROLOG_0(area);                                       \
+       EXCEPTION_PROLOG_0 area ;                                       \
        EXCEPTION_PROLOG_1 hsrr, area, kvm, vec, 0 ;                    \
        EXCEPTION_PROLOG_2_REAL label, hsrr, 0
 
@@ -570,7 +571,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
 /* Version of above for when we have to branch out-of-line */
 #define __OOL_EXCEPTION(vec, label, hdlr)                      \
        SET_SCRATCH0(r13);                                      \
-       EXCEPTION_PROLOG_0(PACA_EXGEN);                         \
+       EXCEPTION_PROLOG_0 PACA_EXGEN ;                         \
        b hdlr
 
 #define STD_EXCEPTION_OOL(vec, label)                          \
@@ -601,7 +602,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
 
 #define __MASKABLE_EXCEPTION(vec, label, hsrr, kvm, bitmask)           \
        SET_SCRATCH0(r13);    /* save r13 */                            \
-       EXCEPTION_PROLOG_0(PACA_EXGEN);                                 \
+       EXCEPTION_PROLOG_0 PACA_EXGEN ;                                 \
        EXCEPTION_PROLOG_1 hsrr, PACA_EXGEN, kvm, vec, bitmask ;        \
        EXCEPTION_PROLOG_2_REAL label, hsrr, 1
 
@@ -621,7 +622,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
 
 #define __MASKABLE_RELON_EXCEPTION(vec, label, hsrr, kvm, bitmask)     \
        SET_SCRATCH0(r13);    /* save r13 */                            \
-       EXCEPTION_PROLOG_0(PACA_EXGEN);                                 \
+       EXCEPTION_PROLOG_0 PACA_EXGEN ;                                 \
        EXCEPTION_PROLOG_1 hsrr, PACA_EXGEN, kvm, vec, bitmask ;        \
        EXCEPTION_PROLOG_2_VIRT label, hsrr