2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-29 23:53:55 +08:00
linux-next/arch/x86/um
Linus Torvalds 54d46ea993 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
Pull signal handling cleanups from Al Viro:
 "sigaltstack infrastructure + conversion for x86, alpha and um,
  COMPAT_SYSCALL_DEFINE infrastructure.

  Note that there are several conflicts between "unify
  SS_ONSTACK/SS_DISABLE definitions" and UAPI patches in mainline;
  resolution is trivial - just remove definitions of SS_ONSTACK and
  SS_DISABLED from arch/*/uapi/asm/signal.h; they are all identical and
  include/uapi/linux/signal.h contains the unified variant."

Fixed up conflicts as per Al.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
  alpha: switch to generic sigaltstack
  new helpers: __save_altstack/__compat_save_altstack, switch x86 and um to those
  generic compat_sys_sigaltstack()
  introduce generic sys_sigaltstack(), switch x86 and um to it
  new helper: compat_user_stack_pointer()
  new helper: restore_altstack()
  unify SS_ONSTACK/SS_DISABLE definitions
  new helper: current_user_stack_pointer()
  missing user_stack_pointer() instances
  Bury the conditionals from kernel_thread/kernel_execve series
  COMPAT_SYSCALL_DEFINE: infrastructure
2012-12-20 18:05:28 -08:00
..
asm missing user_stack_pointer() instances 2012-12-19 18:07:39 -05:00
os-Linux um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
shared/sysdep take sys_fork/sys_vfork/sys_clone prototypes to linux/syscalls.h 2012-11-28 23:43:27 -05:00
vdso coredump: remove VM_ALWAYSDUMP flag 2012-03-23 16:58:42 -07:00
bug.c
bugs_32.c um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
bugs_64.c um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
checksum_32.S x86, extable: Remove open-coded exception table entries in arch/x86/um/checksum_32.S 2012-04-20 13:51:39 -07:00
delay.c um: merge delay_{32,64}.c 2011-11-02 14:15:37 +01:00
elfcore.c
fault.c um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
Kconfig Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal 2012-12-20 18:05:28 -08:00
ksyms.c
ldt.c um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
Makefile x86, um: Use the same style generated syscall tables as native 2011-12-05 16:08:49 -08:00
mem_32.c coredump: remove VM_ALWAYSDUMP flag 2012-03-23 16:58:42 -07:00
mem_64.c um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
ptrace_32.c um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
ptrace_64.c um: unify ptrace_user.h 2011-11-02 14:15:27 +01:00
ptrace_user.c um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
setjmp_32.S
setjmp_64.S
signal.c new helpers: __save_altstack/__compat_save_altstack, switch x86 and um to those 2012-12-19 18:07:41 -05:00
stub_32.S um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
stub_64.S um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
stub_segv.c um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
sys_call_table_32.c introduce generic sys_sigaltstack(), switch x86 and um to it 2012-12-19 18:07:40 -05:00
sys_call_table_64.c introduce generic sys_sigaltstack(), switch x86 and um to it 2012-12-19 18:07:40 -05:00
syscalls_32.c x86, um: switch to generic fork/vfork/clone 2012-11-28 22:13:44 -05:00
syscalls_64.c um: kill thread->forking 2012-09-27 18:04:55 +02:00
sysrq_32.c um: move sysrq.h out of include/shared 2012-10-09 22:28:19 +02:00
sysrq_64.c um: move sysrq.h out of include/shared 2012-10-09 22:28:19 +02:00
tls_32.c um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
tls_64.c um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
user-offsets.c x32: Add x32 system calls to syscall/syscall_64.tbl 2012-02-20 12:48:49 -08:00