Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: 6061/1: PL061 GPIO: Bug fix - setting gpio for HIGH_LEVEL interrupt is not working.
  ARM: 5957/1: ARM: RealView SD/MMC Card detection and write-protect using GPIOLIB
  ARM: 6030/1: KS8695: enable console
  ARM: 6060/1: PL061 GPIO: Setting gpio val after changing direction to OUT.
  ARM: 6059/1: PL061 GPIO: Changing *_irq_chip_data with *_irq_data for real irqs.
  ARM: 6023/1: update bcmring_defconfig to latest version and fix build error
  ARM: fix build error in arch/arm/kernel/process.c

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index 00f46d9ce299..6e8f05c8a1c8 100644
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -149,10 +149,10 @@
 
 #define USER(x...)                              \
 9999:   x;                                      \
-        .section __ex_table,"a";                \
+        .pushsection __ex_table,"a";            \
         .align  3;                              \
         .long   9999b,9001f;                    \
-        .previous
+        .popsection
 
 /*
  * SMP data memory barrier
@@ -193,10 +193,10 @@
         .error  "Unsupported inc macro argument"
         .endif
 
-        .section __ex_table,"a"
+        .pushsection __ex_table,"a"
         .align  3
         .long   9999b, \abort
-        .previous
+        .popsection
         .endm
 
         .macro  usracc, instr, reg, ptr, inc, cond, rept, abort
@@ -234,10 +234,10 @@
         .error  "Unsupported inc macro argument"
         .endif
 
-        .section __ex_table,"a"
+        .pushsection __ex_table,"a"
         .align  3
         .long   9999b, \abort
-        .previous
+        .popsection
         .endr
         .endm