12 files changed, 25 insertions, 24 deletions

diff --git a/arch/arm/lib/backtrace.S b/arch/arm/lib/backtrace.S
index aaf7220d9e30..a673297b0cf1 100644
--- a/arch/arm/lib/backtrace.S
+++ b/arch/arm/lib/backtrace.S
@@ -110,13 +110,13 @@ no_frame:	ldmfd	sp!, {r4 - r8, pc}
 ENDPROC(__backtrace)
 ENDPROC(c_backtrace)
                 
-                .section __ex_table,"a"
+                .pushsection __ex_table,"a"
                 .align  3
                 .long   1001b, 1006b
                 .long   1002b, 1006b
                 .long   1003b, 1006b
                 .long   1004b, 1006b
-                .previous
+                .popsection
 
 #define instr r4
 #define reg   r5
diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
index 1279abd8b886..5e3f99620c04 100644
--- a/arch/arm/lib/clear_user.S
+++ b/arch/arm/lib/clear_user.S
@@ -46,8 +46,8 @@ USER(		strnebt	r2, [r0])
                 ldmfd   sp!, {r1, pc}
 ENDPROC(__clear_user)
 
-                .section .fixup,"ax"
+                .pushsection .fixup,"ax"
                 .align  0
 9001:           ldmfd   sp!, {r0, pc}
-                .previous
+                .popsection
 
diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
index e4fe124acedc..66a477a3e3cc 100644
--- a/arch/arm/lib/copy_from_user.S
+++ b/arch/arm/lib/copy_from_user.S
@@ -90,7 +90,7 @@ ENTRY(__copy_from_user)
 
 ENDPROC(__copy_from_user)
 
-        .section .fixup,"ax"
+        .pushsection .fixup,"ax"
         .align 0
         copy_abort_preamble
         ldmfd   sp!, {r1, r2}
@@ -100,5 +100,5 @@ ENDPROC(__copy_from_user)
         bl      __memzero
         ldr     r0, [sp], #4
         copy_abort_end
-        .previous
+        .popsection
 
diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
index 1a71e1584442..027b69bdbad1 100644
--- a/arch/arm/lib/copy_to_user.S
+++ b/arch/arm/lib/copy_to_user.S
@@ -94,12 +94,12 @@ WEAK(__copy_to_user)
 
 ENDPROC(__copy_to_user)
 
-        .section .fixup,"ax"
+        .pushsection .fixup,"ax"
         .align 0
         copy_abort_preamble
         ldmfd   sp!, {r1, r2, r3}
         sub     r0, r0, r1
         rsb     r0, r0, r2
         copy_abort_end
-        .previous
+        .popsection
 
diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
index fd0e9dcd9fdc..59ff6fdc1e63 100644
--- a/arch/arm/lib/csumpartialcopyuser.S
+++ b/arch/arm/lib/csumpartialcopyuser.S
@@ -68,7 +68,7 @@
  * so properly, we would have to add in whatever registers were loaded before
  * the fault, which, with the current asm above is not predictable.
  */
-                .section .fixup,"ax"
+                .pushsection .fixup,"ax"
                 .align  4
 9001:           mov     r4, #-EFAULT
                 ldr     r5, [fp, #4]            @ *err_ptr
@@ -80,4 +80,4 @@
                 strneb  r0, [r1], #1
                 bne     9002b
                 load_regs
-                .previous
+                .popsection
diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S
index a1814d927122..b1631a7dbe75 100644
--- a/arch/arm/lib/getuser.S
+++ b/arch/arm/lib/getuser.S
@@ -64,9 +64,9 @@ __get_user_bad:
         mov     pc, lr
 ENDPROC(__get_user_bad)
 
-.section __ex_table, "a"
+.pushsection __ex_table, "a"
         .long   1b, __get_user_bad
         .long   2b, __get_user_bad
         .long   3b, __get_user_bad
         .long   4b, __get_user_bad
-.previous
+.popsection
diff --git a/arch/arm/lib/memmove.S b/arch/arm/lib/memmove.S
index 5025c863713d..938fc14f962d 100644
--- a/arch/arm/lib/memmove.S
+++ b/arch/arm/lib/memmove.S
@@ -74,7 +74,7 @@ ENTRY(memmove)
                 rsb     ip, ip, #32
                 addne   pc, pc, ip              @ C is always clear here
                 b       7f
-6:              nop
+6:              W(nop)
                 W(ldr)  r3, [r1, #-4]!
                 W(ldr)  r4, [r1, #-4]!
                 W(ldr)  r5, [r1, #-4]!
@@ -85,7 +85,7 @@ ENTRY(memmove)
 
                 add     pc, pc, ip
                 nop
-                nop
+                W(nop)
                 W(str)  r3, [r0, #-4]!
                 W(str)  r4, [r0, #-4]!
                 W(str)  r5, [r0, #-4]!
diff --git a/arch/arm/lib/putuser.S b/arch/arm/lib/putuser.S
index 02fedbf07c0d..5a01a23c6c06 100644
--- a/arch/arm/lib/putuser.S
+++ b/arch/arm/lib/putuser.S
@@ -81,11 +81,11 @@ __put_user_bad:
         mov     pc, lr
 ENDPROC(__put_user_bad)
 
-.section __ex_table, "a"
+.pushsection __ex_table, "a"
         .long   1b, __put_user_bad
         .long   2b, __put_user_bad
         .long   3b, __put_user_bad
         .long   4b, __put_user_bad
         .long   5b, __put_user_bad
         .long   6b, __put_user_bad
-.previous
+.popsection
diff --git a/arch/arm/lib/strncpy_from_user.S b/arch/arm/lib/strncpy_from_user.S
index 1c9814f346c6..f202d7bd1647 100644
--- a/arch/arm/lib/strncpy_from_user.S
+++ b/arch/arm/lib/strncpy_from_user.S
@@ -33,11 +33,11 @@ ENTRY(__strncpy_from_user)
         mov     pc, lr
 ENDPROC(__strncpy_from_user)
 
-        .section .fixup,"ax"
+        .pushsection .fixup,"ax"
         .align  0
 9001:   mov     r3, #0
         strb    r3, [r0, #0]    @ null terminate
         mov     r0, #-EFAULT
         mov     pc, lr
-        .previous
+        .popsection
 
diff --git a/arch/arm/lib/strnlen_user.S b/arch/arm/lib/strnlen_user.S
index 7855b2906659..0ecbb459c4f1 100644
--- a/arch/arm/lib/strnlen_user.S
+++ b/arch/arm/lib/strnlen_user.S
@@ -33,8 +33,8 @@ ENTRY(__strnlen_user)
         mov     pc, lr
 ENDPROC(__strnlen_user)
 
-        .section .fixup,"ax"
+        .pushsection .fixup,"ax"
         .align  0
 9001:   mov     r0, #0
         mov     pc, lr
-        .previous
+        .popsection
diff --git a/arch/arm/lib/uaccess.S b/arch/arm/lib/uaccess.S
index ffdd27498cee..fee9f6f88adb 100644
--- a/arch/arm/lib/uaccess.S
+++ b/arch/arm/lib/uaccess.S
@@ -279,10 +279,10 @@ USER(		strgtbt	r3, [r0], #1)			@ May fault
                 b       .Lc2u_finished
 ENDPROC(__copy_to_user)
 
-                .section .fixup,"ax"
+                .pushsection .fixup,"ax"
                 .align  0
 9001:           ldmfd   sp!, {r0, r4 - r7, pc}
-                .previous
+                .popsection
 
 /* Prototype: unsigned long __copy_from_user(void *to,const void *from,unsigned long n);
  * Purpose  : copy a block from user memory to kernel memory
@@ -545,7 +545,7 @@ USER(		ldrgtbt	r3, [r1], #1)			@ May fault
                 b       .Lcfu_finished
 ENDPROC(__copy_from_user)
 
-                .section .fixup,"ax"
+                .pushsection .fixup,"ax"
                 .align  0
                 /*
                  * We took an exception.  r0 contains a pointer to
@@ -559,5 +559,5 @@ ENDPROC(__copy_from_user)
                 blne    __memzero
                 mov     r0, r4
                 ldmfd   sp!, {r4 - r7, pc}
-                .previous
+                .popsection
 
diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
index 6b967ffb6552..e2d2f2cd0c4f 100644
--- a/arch/arm/lib/uaccess_with_memcpy.c
+++ b/arch/arm/lib/uaccess_with_memcpy.c
@@ -16,6 +16,7 @@
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/hardirq.h> /* for in_atomic() */
+#include <linux/gfp.h>
 #include <asm/current.h>
 #include <asm/page.h>