Merge remote-tracking branch 'signal/for-next'

Conflicts:
	arch/mips/kernel/linux32.c
	arch/tile/Kconfig
	arch/tile/kernel/compat.c
	include/asm-generic/unistd.h

diff --cc arch/Kconfig
Simple merge

diff --cc arch/alpha/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/include/asm/systbl.h
Simple merge

diff --cc arch/powerpc/include/asm/unistd.h
Simple merge

diff --cc arch/s390/Kconfig
index eb8fb629f00bba774b195a475471d630d6bd8bd0,f6cc1528df89b8ffd35591ba166d37f9e0fdff4d..830ec55d246feffd88867af4e07ab78f0501cec0
--- 1/arch/s390/Kconfig
--- 2/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -131,10 -131,9 +131,9 @@@ config S39
        select HAVE_PERF_EVENTS
        select HAVE_REGS_AND_STACK_ACCESS_API
        select HAVE_SYSCALL_TRACEPOINTS
-       select HAVE_SYSCALL_WRAPPERS
        select HAVE_UID16 if 32BIT
        select HAVE_VIRT_CPU_ACCOUNTING
 -      select HAVE_VIRT_TO_BUS
 +      select VIRT_TO_BUS
        select INIT_ALL_POSSIBLE
        select KTIME_SCALAR if 32BIT
        select MODULES_USE_ELF_RELA

diff --cc arch/sparc/Kconfig
Simple merge

diff --cc arch/tile/Kconfig
index 9a9d08637ab9b56f6af9d52908a999753a6ed6ff,95bd2ef6c9439ab88fc5c6a01ecde2c1ac4bcd2f..72c13cad3307343417ad092cd48c2035048937a9
--- 1/arch/tile/Kconfig
--- 2/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@@ -16,8 -16,7 +16,7 @@@ config TIL
        select GENERIC_PENDING_IRQ if SMP
        select GENERIC_IRQ_SHOW
        select HAVE_DEBUG_BUGVERBOSE
-       select HAVE_SYSCALL_WRAPPERS if TILEGX
 -      select HAVE_VIRT_TO_BUS
 +      select VIRT_TO_BUS
        select SYS_HYPERVISOR
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_CLOCKEVENTS

diff --cc arch/tile/kernel/compat.c
index 6ea4cdb3c6a03e3ab5991969bd485047cac23bc3,c262a02d8efa4acbe3a56364da2ae5d31d748db8..ed378416b86aa128b3eed7a3f20e010fedad740a
--- 1/arch/tile/kernel/compat.c
--- 2/arch/tile/kernel/compat.c
+++ b/arch/tile/kernel/compat.c
@@@ -56,15 -54,9 +56,9 @@@ COMPAT_SYSCALL_DEFINE6(pwrite64, unsign
        return sys_pwrite64(fd, ubuf, count, ((loff_t)high << 32) | low);
  }
  
- COMPAT_SYSCALL_DEFINE4(lookup_dcookie, u32, low, u32, high,
-                        char __user *, buf, size_t, len)
- {
-       return sys_lookup_dcookie(((loff_t)high << 32) | low, buf, len);
- }
- 
 -long compat_sys_sync_file_range2(int fd, unsigned int flags,
 -                               u32 offset_lo, u32 offset_hi,
 -                               u32 nbytes_lo, u32 nbytes_hi)
 +COMPAT_SYSCALL_DEFINE6(sync_file_range2, int, fd, unsigned int, flags,
 +                       u32, offset_lo, u32, offset_hi,
 +                       u32, nbytes_lo, u32, nbytes_hi)
  {
        return sys_sync_file_range(fd, ((loff_t)offset_hi << 32) | offset_lo,
                                   ((loff_t)nbytes_hi << 32) | nbytes_lo,

diff --cc fs/compat.c
Simple merge

diff --cc include/asm-generic/unistd.h
Simple merge

diff --cc include/linux/compat.h
Simple merge

diff --cc include/linux/linkage.h
index 807f1e5332267e6bd776f9591f106b723e1c02ab,829d66c67fc20580a82b5ce7a1be3bf9083c2944..bedcddf2594cf1e6f1216b4926d96578c4f91b66
--- 1/include/linux/linkage.h
--- 2/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@@ -2,6 -2,7 +2,7 @@@
  #define _LINUX_LINKAGE_H
  
  #include <linux/compiler.h>
 -#include <linux/stringify.h>
++#include <linux/export.h>
  #include <asm/linkage.h>
  
  #ifdef __cplusplus
@@@ -14,6 -15,26 +15,18 @@@
  #define asmlinkage CPP_ASMLINKAGE
  #endif
  
 -#ifndef SYMBOL_NAME
 -#ifdef CONFIG_SYMBOL_PREFIX
 -#define SYMBOL_NAME(x) CONFIG_SYMBOL_PREFIX ## x
 -#else
 -#define SYMBOL_NAME(x) x
 -#endif
 -#endif
 -#define __SYMBOL_NAME(x) __stringify(SYMBOL_NAME(x))
 -
+ #ifndef cond_syscall
 -#define cond_syscall(x) asm(".weak\t" __SYMBOL_NAME(x) \
 -      "\n\t.set\t" __SYMBOL_NAME(x) "," __SYMBOL_NAME(sys_ni_syscall));
++#define cond_syscall(x) asm(".weak\t" VMLINUX_SYMBOL_STR(x) "\n\t"    \
++                          ".set\t" VMLINUX_SYMBOL_STR(x) ","  \
++                          VMLINUX_SYMBOL_STR(sys_ni_syscall))
+ #endif
+ 
+ #ifndef SYSCALL_ALIAS
+ #define SYSCALL_ALIAS(alias, name)                            \
 -      asm ("\t.globl " __SYMBOL_NAME(alias)                   \
 -      "\n\t.set\t" __SYMBOL_NAME(alias) "," __SYMBOL_NAME(name))
++      asm ("\t.globl " VMLINUX_SYMBOL_STR(alias)                      \
++      "\n\t.set\t" VMLINUX_SYMBOL_STR(alias) "," VMLINUX_SYMBOL_STR(name))
+ #endif
+ 
  #define __page_aligned_data   __section(.data..page_aligned) __aligned(PAGE_SIZE)
  #define __page_aligned_bss    __section(.bss..page_aligned) __aligned(PAGE_SIZE)
  

diff --cc kernel/fork.c
Simple merge