Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	include/asm-x86/statfs.h

1 files changed, 10 insertions, 8 deletions

diff --git a/arch/arm/lib/putuser.S b/arch/arm/lib/putuser.S
index 08ec7dffa52e..864f3c1c4f18 100644
--- a/arch/arm/lib/putuser.S
+++ b/arch/arm/lib/putuser.S
@@ -26,16 +26,16 @@
  * Note that ADDR_LIMIT is either 0 or 0xc0000000
  * Note also that it is intended that __put_user_bad is not global.
  */
+#include <linux/linkage.h>
 #include <asm/errno.h>
 
-        .global __put_user_1
-__put_user_1:
+ENTRY(__put_user_1)
 1:      strbt   r2, [r0]
         mov     r0, #0
         mov     pc, lr
+ENDPROC(__put_user_1)
 
-        .global __put_user_2
-__put_user_2:
+ENTRY(__put_user_2)
         mov     ip, r2, lsr #8
 #ifndef __ARMEB__
 2:      strbt   r2, [r0], #1
@@ -46,23 +46,25 @@ __put_user_2:
 #endif
         mov     r0, #0
         mov     pc, lr
+ENDPROC(__put_user_2)
 
-        .global __put_user_4
-__put_user_4:
+ENTRY(__put_user_4)
 4:      strt    r2, [r0]
         mov     r0, #0
         mov     pc, lr
+ENDPROC(__put_user_4)
 
-        .global __put_user_8
-__put_user_8:
+ENTRY(__put_user_8)
 5:      strt    r2, [r0], #4
 6:      strt    r3, [r0]
         mov     r0, #0
         mov     pc, lr
+ENDPROC(__put_user_8)
 
 __put_user_bad:
         mov     r0, #-EFAULT
         mov     pc, lr
+ENDPROC(__put_user_bad)
 
 .section __ex_table, "a"
         .long   1b, __put_user_bad