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

Conflicts:
	arch/arm/include/asm/thread_info.h
	arch/c6x/Kconfig
	arch/c6x/kernel/process.c
	arch/frv/kernel/process.c
	arch/m68k/Kconfig
	arch/m68k/kernel/process.c
	arch/mn10300/Kconfig
	arch/mn10300/kernel/process.c
	arch/powerpc/Kconfig
	arch/powerpc/kernel/process.c
	arch/powerpc/kernel/sys_ppc32.c

diff --cc arch/arm/include/asm/thread_info.h
index f71cdab18b87589beb5d4df33bcae80483e71536,b2d6b412172d1990cedd5d873a4fdae07bbade67..8477b4c1d39fb3fe43c21691d1ad46846a947e89
--- 1/arch/arm/include/asm/thread_info.h
--- 2/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@@ -150,8 -148,6 +150,7 @@@ extern int vfp_restore_user_hwstate(str
  #define TIF_NOTIFY_RESUME     2       /* callback before returning to user */
  #define TIF_SYSCALL_TRACE     8
  #define TIF_SYSCALL_AUDIT     9
- #define TIF_POLLING_NRFLAG    16
 +#define TIF_SYSCALL_TRACEPOINT        10
  #define TIF_USING_IWMMXT      17
  #define TIF_MEMDIE            18      /* is terminating due to OOM killer */
  #define TIF_RESTORE_SIGMASK   20
@@@ -163,8 -159,6 +162,7 @@@
  #define _TIF_NOTIFY_RESUME    (1 << TIF_NOTIFY_RESUME)
  #define _TIF_SYSCALL_TRACE    (1 << TIF_SYSCALL_TRACE)
  #define _TIF_SYSCALL_AUDIT    (1 << TIF_SYSCALL_AUDIT)
- #define _TIF_POLLING_NRFLAG   (1 << TIF_POLLING_NRFLAG)
 +#define _TIF_SYSCALL_TRACEPOINT       (1 << TIF_SYSCALL_TRACEPOINT)
  #define _TIF_USING_IWMMXT     (1 << TIF_USING_IWMMXT)
  #define _TIF_SECCOMP          (1 << TIF_SECCOMP)
  

diff --cc arch/c6x/Kconfig
index f6a3648f5ec3c7030a8c4294be4e3bee54a25b6c,45268b50c0c88907e09a738a3d60f55c4ac2afe5..20ef56e467b364d930ed42749f22ebb97eeaba2f
--- 1/arch/c6x/Kconfig
--- 2/arch/c6x/Kconfig
+++ b/arch/c6x/Kconfig
@@@ -17,7 -17,7 +17,8 @@@ config C6
        select OF
        select OF_EARLY_FLATTREE
        select GENERIC_CLOCKEVENTS
 +      select MODULES_USE_ELF_RELA
+       select GENERIC_KERNEL_THREAD
  
  config MMU
        def_bool n

diff --cc arch/c6x/include/uapi/asm/unistd.h
index ed2259043eec278b5a792b0660a326e66e292142,0000000000000000000000000000000000000000..4ff747d12dad317e408c86bf8df6285bb31d980b
mode 100644,000000..100644
--- 1/arch/c6x/include/uapi/asm/unistd.h
--- /dev/null
+++ b/arch/c6x/include/uapi/asm/unistd.h
@@@ -1,22 -1,0 +1,25 @@@
 +/*
 + * Copyright (C) 2011 Texas Instruments Incorporated
 + *
 + * Based on arch/tile version.
 + *
 + *   This program is free software; you can redistribute it and/or
 + *   modify it under the terms of the GNU General Public License
 + *   as published by the Free Software Foundation, version 2.
 + *
 + *   This program is distributed in the hope that it will be useful, but
 + *   WITHOUT ANY WARRANTY; without even the implied warranty of
 + *   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
 + *   NON INFRINGEMENT.        See the GNU General Public License for
 + *   more details.
 + */
 +
++#define __ARCH_WANT_KERNEL_EXECVE
++#define __ARCH_WANT_SYS_EXECVE
++
 +/* Use the standard ABI for syscalls. */
 +#include <asm-generic/unistd.h>
 +
 +/* C6X-specific syscalls. */
 +#define __NR_cache_sync       (__NR_arch_specific_syscall + 0)
 +__SYSCALL(__NR_cache_sync, sys_cache_sync)

diff --cc arch/frv/Kconfig
Simple merge

diff --cc arch/frv/kernel/process.c
Simple merge

diff --cc arch/ia64/kernel/signal.c
Simple merge

diff --cc arch/m68k/Kconfig
index 6710084e072abeb484cc00f93805352aa9d4099d,ccda007ba40fae0e0d0fb7e8b18febabb368cc27..dfdb315f5609066bcd7bbad8349be98c8e97ef6e
--- 1/arch/m68k/Kconfig
--- 2/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@@ -15,9 -13,7 +15,10 @@@ config M68
        select FPU if MMU
        select ARCH_WANT_IPC_PARSE_VERSION
        select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE
 +      select HAVE_MOD_ARCH_SPECIFIC
 +      select MODULES_USE_ELF_REL
 +      select MODULES_USE_ELF_RELA
+       select GENERIC_KERNEL_THREAD
  
  config RWSEM_GENERIC_SPINLOCK
        bool

diff --cc arch/m68k/kernel/process.c
Simple merge

diff --cc arch/microblaze/kernel/signal.c
Simple merge

diff --cc arch/mn10300/Kconfig
index aa03f2e13385fe5083a50b17ae6f8c02e3ccb269,ddbdc33471a830b152ec1f5cb3dcf9912d805fda..549b9e50182eb26ab8d10a9eae0e9f38e63e852f
--- 1/arch/mn10300/Kconfig
--- 2/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@@ -8,7 -8,7 +8,8 @@@ config MN1030
        select HAVE_ARCH_KGDB
        select HAVE_NMI_WATCHDOG if MN10300_WD_TIMER
        select GENERIC_CLOCKEVENTS
 +      select MODULES_USE_ELF_RELA
+       select GENERIC_KERNEL_THREAD
  
  config AM33_2
        def_bool n

diff --cc arch/mn10300/kernel/process.c
Simple merge

diff --cc arch/powerpc/Kconfig
index 0116f6ed23e0abf9b785c2e8985efc92f5960edf,6e5a0979c085b9947e395a8a06dd7d3cae15d554..359f5765deac09868b9f127af5d27279f3a7d64d
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -141,8 -139,7 +141,9 @@@ config PP
        select GENERIC_CLOCKEVENTS
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
 +      select HAVE_MOD_ARCH_SPECIFIC
 +      select MODULES_USE_ELF_RELA
+       select GENERIC_KERNEL_THREAD
  
  config EARLY_PRINTK
        bool

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

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

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

diff --cc arch/powerpc/include/asm/unistd.h
index d974bca0c33dbcfe92ce1e06e69d873dcc85e552,26a6825909b6de44ded64ddb78b4c4e96b0c75c0..921dce6d84458d3ef02b7b8ea1a6590809c226ef
--- 1/arch/powerpc/include/asm/unistd.h
--- 2/arch/powerpc/include/asm/unistd.h
+++ b/arch/powerpc/include/asm/unistd.h
@@@ -53,8 -419,9 +53,10 @@@
  #define __ARCH_WANT_COMPAT_SYS_TIME
  #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
  #define __ARCH_WANT_SYS_NEWFSTATAT
 +#define __ARCH_WANT_COMPAT_SYS_SENDFILE
  #endif
+ #define __ARCH_WANT_SYS_EXECVE
+ #define __ARCH_WANT_KERNEL_EXECVE
  
  /*
   * "Conditional" syscalls

diff --cc arch/powerpc/kernel/entry_32.S
Simple merge

diff --cc arch/powerpc/kernel/entry_64.S
Simple merge

diff --cc arch/powerpc/kernel/ppc_ksyms.c
Simple merge

diff --cc arch/powerpc/kernel/process.c
Simple merge

diff --cc arch/powerpc/kernel/sys_ppc32.c
index a3de472b7246b9625e8c2762b8c866834269bc8c,a1ae73a0f352857407b38811e62161217cd14e70..9c2ed90ece8f4cdb93b75456f70376b944d52703
--- 1/arch/powerpc/kernel/sys_ppc32.c
--- 2/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
@@@ -143,42 -143,50 +143,19 @@@ long compat_sys_ipc(u32 call, u32 first
   * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
   * and the register representation of a signed int (msr in 64-bit mode) is performed.
   */
 -asmlinkage long compat_sys_sendfile(u32 out_fd, u32 in_fd, compat_off_t __user * offset, u32 count)
 +asmlinkage long compat_sys_sendfile_wrapper(u32 out_fd, u32 in_fd,
 +                                          compat_off_t __user *offset, u32 count)
  {
 -      mm_segment_t old_fs = get_fs();
 -      int ret;
 -      off_t of;
 -      off_t __user *up;
 -
 -      if (offset && get_user(of, offset))
 -              return -EFAULT;
 -
 -      /* The __user pointer cast is valid because of the set_fs() */          
 -      set_fs(KERNEL_DS);
 -      up = offset ? (off_t __user *) &of : NULL;
 -      ret = sys_sendfile((int)out_fd, (int)in_fd, up, count);
 -      set_fs(old_fs);
 -      
 -      if (offset && put_user(of, offset))
 -              return -EFAULT;
 -              
 -      return ret;
 +      return compat_sys_sendfile((int)out_fd, (int)in_fd, offset, count);
  }
  
 -asmlinkage int compat_sys_sendfile64(int out_fd, int in_fd, compat_loff_t __user *offset, s32 count)
 +asmlinkage long compat_sys_sendfile64_wrapper(u32 out_fd, u32 in_fd,
 +                                            compat_loff_t __user *offset, u32 count)
  {
 -      mm_segment_t old_fs = get_fs();
 -      int ret;
 -      loff_t lof;
 -      loff_t __user *up;
 -      
 -      if (offset && get_user(lof, offset))
 -              return -EFAULT;
 -              
 -      /* The __user pointer cast is valid because of the set_fs() */          
 -      set_fs(KERNEL_DS);
 -      up = offset ? (loff_t __user *) &lof : NULL;
 -      ret = sys_sendfile64(out_fd, in_fd, up, count);
 -      set_fs(old_fs);
 -      
 -      if (offset && put_user(lof, offset))
 -              return -EFAULT;
 -              
 -      return ret;
 +      return sys_sendfile((int)out_fd, (int)in_fd,
 +                          (off_t __user *)offset, count);
  }
  
- long compat_sys_execve(unsigned long a0, unsigned long a1, unsigned long a2,
-                 unsigned long a3, unsigned long a4, unsigned long a5,
-                 struct pt_regs *regs)
- {
-       int error;
-       struct filename *filename;
-       
-       filename = getname((char __user *) a0);
-       error = PTR_ERR(filename);
-       if (IS_ERR(filename))
-               goto out;
-       flush_fp_to_thread(current);
-       flush_altivec_to_thread(current);
- 
-       error = compat_do_execve(filename->name, compat_ptr(a1),
-                               compat_ptr(a2), regs);
- 
-       putname(filename);
- 
- out:
-       return error;
- }
- 
  /* Note: it is necessary to treat option as an unsigned int, 
   * with the corresponding cast to a signed int to insure that the 
   * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)

diff --cc arch/tile/kernel/compat_signal.c
Simple merge

diff --cc arch/x86/kernel/entry_32.S
Simple merge

diff --cc kernel/sched/core.c
Simple merge