diff options
author | Linus Torvalds | 2012-12-20 20:05:28 -0600 |
---|---|---|
committer | Linus Torvalds | 2012-12-20 20:05:28 -0600 |
commit | 54d46ea993744c5408e39ce0cb4851e13cbea716 (patch) | |
tree | 8e38fa92cc2ae72e0353c44e1e68be9bf5a7a058 /arch/score | |
parent | f59dc2bb5a50b26ea751f9eac1c81e4cc7de5257 (diff) | |
parent | 50ececcfa7d1acee085b2c518cad495062db6379 (diff) | |
download | am43-linux-kernel-54d46ea993744c5408e39ce0cb4851e13cbea716.tar.gz am43-linux-kernel-54d46ea993744c5408e39ce0cb4851e13cbea716.tar.xz am43-linux-kernel-54d46ea993744c5408e39ce0cb4851e13cbea716.zip |
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
Diffstat (limited to 'arch/score')
-rw-r--r-- | arch/score/Kconfig | 2 | ||||
-rw-r--r-- | arch/score/include/asm/ptrace.h | 1 | ||||
-rw-r--r-- | arch/score/include/uapi/asm/unistd.h | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/arch/score/Kconfig b/arch/score/Kconfig index 45893390c7d..3b1482e7afa 100644 --- a/arch/score/Kconfig +++ b/arch/score/Kconfig | |||
@@ -13,8 +13,6 @@ config SCORE | |||
13 | select GENERIC_CLOCKEVENTS | 13 | select GENERIC_CLOCKEVENTS |
14 | select HAVE_MOD_ARCH_SPECIFIC | 14 | select HAVE_MOD_ARCH_SPECIFIC |
15 | select MODULES_USE_ELF_REL | 15 | select MODULES_USE_ELF_REL |
16 | select GENERIC_KERNEL_THREAD | ||
17 | select GENERIC_KERNEL_EXECVE | ||
18 | select CLONE_BACKWARDS | 16 | select CLONE_BACKWARDS |
19 | 17 | ||
20 | choice | 18 | choice |
diff --git a/arch/score/include/asm/ptrace.h b/arch/score/include/asm/ptrace.h index 78fc538db84..abc279d96b7 100644 --- a/arch/score/include/asm/ptrace.h +++ b/arch/score/include/asm/ptrace.h | |||
@@ -13,6 +13,7 @@ struct task_struct; | |||
13 | 13 | ||
14 | #define instruction_pointer(regs) ((unsigned long)(regs)->cp0_epc) | 14 | #define instruction_pointer(regs) ((unsigned long)(regs)->cp0_epc) |
15 | #define profile_pc(regs) instruction_pointer(regs) | 15 | #define profile_pc(regs) instruction_pointer(regs) |
16 | #define user_stack_pointer(r) ((unsigned long)(r)->regs[0]) | ||
16 | 17 | ||
17 | extern void do_syscall_trace(struct pt_regs *regs, int entryexit); | 18 | extern void do_syscall_trace(struct pt_regs *regs, int entryexit); |
18 | extern int read_tsk_long(struct task_struct *, unsigned long, unsigned long *); | 19 | extern int read_tsk_long(struct task_struct *, unsigned long, unsigned long *); |
diff --git a/arch/score/include/uapi/asm/unistd.h b/arch/score/include/uapi/asm/unistd.h index 56001c93095..9cb4260a5f3 100644 --- a/arch/score/include/uapi/asm/unistd.h +++ b/arch/score/include/uapi/asm/unistd.h | |||
@@ -4,7 +4,6 @@ | |||
4 | #define __ARCH_WANT_SYSCALL_NO_FLAGS | 4 | #define __ARCH_WANT_SYSCALL_NO_FLAGS |
5 | #define __ARCH_WANT_SYSCALL_OFF_T | 5 | #define __ARCH_WANT_SYSCALL_OFF_T |
6 | #define __ARCH_WANT_SYSCALL_DEPRECATED | 6 | #define __ARCH_WANT_SYSCALL_DEPRECATED |
7 | #define __ARCH_WANT_SYS_EXECVE | ||
8 | #define __ARCH_WANT_SYS_CLONE | 7 | #define __ARCH_WANT_SYS_CLONE |
9 | #define __ARCH_WANT_SYS_FORK | 8 | #define __ARCH_WANT_SYS_FORK |
10 | #define __ARCH_WANT_SYS_VFORK | 9 | #define __ARCH_WANT_SYS_VFORK |