Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / arch / arm / include / asm / assembler.h

diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index 00f46d9..6e8f05c 100644 (file)
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -149,10 +149,10 @@
 
 #define USER(x...)                             \
 9999:  x;                                      \
 
 #define USER(x...)                             \
 9999:  x;                                      \

-       .section __ex_table,"a";                \
+       .pushsection __ex_table,"a";            \

        .align  3;                              \
        .long   9999b,9001f;                    \
        .align  3;                              \
        .long   9999b,9001f;                    \

-       .previous
+       .popsection

 
 /*
  * SMP data memory barrier
 
 /*
  * SMP data memory barrier


@@ -193,10 +193,10 @@
        .error  "Unsupported inc macro argument"
        .endif
 
        .error  "Unsupported inc macro argument"
        .endif
 

-       .section __ex_table,"a"
+       .pushsection __ex_table,"a"

        .align  3
        .long   9999b, \abort
        .align  3
        .long   9999b, \abort

-       .previous
+       .popsection

        .endm
 
        .macro  usracc, instr, reg, ptr, inc, cond, rept, abort
        .endm
 
        .macro  usracc, instr, reg, ptr, inc, cond, rept, abort


@@ -234,10 +234,10 @@
        .error  "Unsupported inc macro argument"
        .endif
 
        .error  "Unsupported inc macro argument"
        .endif
 

-       .section __ex_table,"a"
+       .pushsection __ex_table,"a"

        .align  3
        .long   9999b, \abort
        .align  3
        .long   9999b, \abort

-       .previous
+       .popsection

        .endr
        .endm
 
        .endr
        .endm