Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6: (78 commits)
  [PARISC] Use symbolic last syscall in __NR_Linux_syscalls
  [PARISC] Add missing statfs64 and fstatfs64 syscalls
  Revert "[PARISC] Optimize TLB flush on SMP systems"
  [PARISC] Compat signal fixes for 64-bit parisc
  [PARISC] Reorder syscalls to match unistd.h
  Revert "[PATCH] make kernel/signal.c:kill_proc_info() static"
  [PARISC] fix sys_rt_sigqueueinfo
  [PARISC] fix section mismatch warnings in harmony sound driver
  [PARISC] do not export get_register/set_register
  [PARISC] add ENTRY()/ENDPROC() and simplify assembly of HP/UX emulation code
  [PARISC] convert to use CONFIG_64BIT instead of __LP64__
  [PARISC] use CONFIG_64BIT instead of __LP64__
  [PARISC] add ASM_EXCEPTIONTABLE_ENTRY() macro
  [PARISC] more ENTRY(), ENDPROC(), END() conversions
  [PARISC] fix ENTRY() and ENDPROC() for 64bit-parisc
  [PARISC] Fixes /proc/cpuinfo cache output on B160L
  [PARISC] implement standard ENTRY(), END() and ENDPROC()
  [PARISC] kill ENTRY_SYS_CPUS
  [PARISC] clean up debugging printks in smp.c
  [PARISC] factor syscall_restart code out of do_signal
  ...

Fix conflict in include/linux/sched.h due to kill_proc_info() being made
publicly available to PARISC again.

1 files changed, 12 insertions, 25 deletions

diff --git a/arch/parisc/lib/lusercopy.S b/arch/parisc/lib/lusercopy.S
index a0509855c9a7..1bd23ccec17b 100644
--- a/arch/parisc/lib/lusercopy.S
+++ b/arch/parisc/lib/lusercopy.S
@@ -37,6 +37,7 @@
         
 #include <asm/assembly.h>
 #include <asm/errno.h>
+#include <linux/linkage.h>
 
         /*
          * get_sr gets the appropriate space value into
@@ -67,8 +68,7 @@
          *         otherwise strlen (i.e. excludes zero byte)
          */
 
-        .export lstrncpy_from_user,code
-lstrncpy_from_user:
+ENTRY(lstrncpy_from_user)
         .proc
         .callinfo NO_CALLS
         .entry
@@ -87,6 +87,7 @@ $lsfu_exit:
         bv          %r0(%r2)
         nop
         .exit
+ENDPROC(lstrncpy_from_user)
 
         .section .fixup,"ax"
 3:      fixup_branch $lsfu_exit
@@ -94,13 +95,8 @@ $lsfu_exit:
         .previous
 
         .section __ex_table,"aw"
-#ifdef __LP64__
-        .dword      1b,3b
-        .dword      2b,3b
-#else
-        .word       1b,3b
-        .word       2b,3b
-#endif
+        ASM_ULONG_INSN 1b,3b
+        ASM_ULONG_INSN 2b,3b
         .previous
 
         .procend
@@ -112,8 +108,7 @@ $lsfu_exit:
          * otherwise, returns number of bytes not transferred.
          */
 
-        .export lclear_user,code
-lclear_user:
+ENTRY(lclear_user)
         .proc
         .callinfo NO_CALLS
         .entry
@@ -127,6 +122,7 @@ $lclu_done:
         bv          %r0(%r2)
         copy        %r25,%r28
         .exit
+ENDPROC(lclear_user)
 
         .section .fixup,"ax"
 2:      fixup_branch $lclu_done
@@ -134,11 +130,7 @@ $lclu_done:
         .previous
 
         .section __ex_table,"aw"
-#ifdef __LP64__
-        .dword      1b,2b
-#else
-        .word       1b,2b
-#endif
+        ASM_ULONG_INSN 1b,2b
         .previous
 
         .procend
@@ -151,8 +143,7 @@ $lclu_done:
          *         else strlen + 1 (i.e. includes zero byte).
          */
 
-        .export lstrnlen_user,code
-lstrnlen_user:
+ENTRY(lstrnlen_user)
         .proc
         .callinfo NO_CALLS
         .entry
@@ -172,6 +163,7 @@ $lslen_done:
 $lslen_nzero:
         b           $lslen_done
         ldo         1(%r26),%r26 /* special case for N == 0 */
+ENDPROC(lstrnlen_user)
 
         .section .fixup,"ax"
 3:      fixup_branch $lslen_done
@@ -179,13 +171,8 @@ $lslen_nzero:
         .previous
 
         .section __ex_table,"aw"
-#ifdef __LP64__
-        .dword      1b,3b
-        .dword      2b,3b
-#else
-        .word       1b,3b
-        .word       2b,3b
-#endif
+        ASM_ULONG_INSN 1b,3b
+        ASM_ULONG_INSN 2b,3b
         .previous
 
         .procend