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, 10 insertions, 28 deletions

diff --git a/arch/parisc/lib/memcpy.c b/arch/parisc/lib/memcpy.c
index 5575e41f9d60..2c43ebe99a9c 100644
--- a/arch/parisc/lib/memcpy.c
+++ b/arch/parisc/lib/memcpy.c
@@ -96,30 +96,18 @@ DECLARE_PER_CPU(struct exception_data, exception_data);
 #define DPRINTF(fmt, args...)
 #endif
 
-#ifndef __LP64__
-#define EXC_WORD ".word"
-#else
-#define EXC_WORD ".dword"
-#endif
-
 #define def_load_ai_insn(_insn,_sz,_tt,_s,_a,_t,_e)     \
         __asm__ __volatile__ (                          \
-        "1:\t" #_insn ",ma " #_sz "(" _s ",%1), %0\n"   \
-        "\t.section __ex_table,\"aw\"\n"                \
-        "\t" EXC_WORD "\t1b\n"                          \
-        "\t" EXC_WORD "\t" #_e "\n"                     \
-        "\t.previous\n"                                 \
+        "1:\t" #_insn ",ma " #_sz "(" _s ",%1), %0\n\t" \
+        ASM_EXCEPTIONTABLE_ENTRY(1b,_e)                 \
         : _tt(_t), "+r"(_a)                             \
         :                                               \
         : "r8")
 
 #define def_store_ai_insn(_insn,_sz,_tt,_s,_a,_t,_e)    \
         __asm__ __volatile__ (                          \
-        "1:\t" #_insn ",ma %1, " #_sz "(" _s ",%0)\n"   \
-        "\t.section __ex_table,\"aw\"\n"                \
-        "\t" EXC_WORD "\t1b\n"                          \
-        "\t" EXC_WORD "\t" #_e "\n"                     \
-        "\t.previous\n"                                 \
+        "1:\t" #_insn ",ma %1, " #_sz "(" _s ",%0)\n\t" \
+        ASM_EXCEPTIONTABLE_ENTRY(1b,_e)                 \
         : "+r"(_a)                                      \
         : _tt(_t)                                       \
         : "r8")
@@ -133,22 +121,16 @@ DECLARE_PER_CPU(struct exception_data, exception_data);
 
 #define def_load_insn(_insn,_tt,_s,_o,_a,_t,_e)         \
         __asm__ __volatile__ (                          \
-        "1:\t" #_insn " " #_o "(" _s ",%1), %0\n"       \
-        "\t.section __ex_table,\"aw\"\n"                \
-        "\t" EXC_WORD "\t1b\n"                          \
-        "\t" EXC_WORD "\t" #_e "\n"                     \
-        "\t.previous\n"                                 \
+        "1:\t" #_insn " " #_o "(" _s ",%1), %0\n\t"     \
+        ASM_EXCEPTIONTABLE_ENTRY(1b,_e)                 \
         : _tt(_t)                                       \
         : "r"(_a)                                       \
         : "r8")
 
 #define def_store_insn(_insn,_tt,_s,_t,_o,_a,_e)        \
         __asm__ __volatile__ (                          \
-        "1:\t" #_insn " %0, " #_o "(" _s ",%1)\n"       \
-        "\t.section __ex_table,\"aw\"\n"                \
-        "\t" EXC_WORD "\t1b\n"                          \
-        "\t" EXC_WORD "\t" #_e "\n"                     \
-        "\t.previous\n"                                 \
+        "1:\t" #_insn " %0, " #_o "(" _s ",%1)\n\t"     \
+        ASM_EXCEPTIONTABLE_ENTRY(1b,_e)                 \
         :                                               \
         : _tt(_t), "r"(_a)                              \
         : "r8")
@@ -167,8 +149,8 @@ extern inline void prefetch_dst(const void *addr)
         __asm__("ldd 0(" d_space ",%0), %%r0" : : "r" (addr));
 }
 #else
-#define prefetch_src(addr)
-#define prefetch_dst(addr)
+#define prefetch_src(addr) do { } while(0)
+#define prefetch_dst(addr) do { } while(0)
 #endif
 
 /* Copy from a not-aligned src to an aligned dst, using shifts. Handles 4 words