AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

arm64: ptrace: remove obsolete ptrace request numbers from user headers

Browse Source 
The use of regsets has removed the need for many private ptrace requests,
so remove the corresponding definitions from the user-visible ptrace.h

Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
Will Deacon 2012-09-27 11:38:12 +01:00 committed by Catalin Marinas
parent 0d0109a440
commit 27aa55c5e5
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/arm64/include/asm/ptrace.h
View File

@ -23,20 +23,15 @@
#include <asm/hwcap.h> #include <asm/hwcap.h>
#define PTRACE_GETREGS 12
#define PTRACE_SETREGS 13
#define PTRACE_GETFPSIMDREGS 14
#define PTRACE_SETFPSIMDREGS 15
/* PTRACE_ATTACH is 16 */
/* PTRACE_DETACH is 17 */
#define PTRACE_GET_THREAD_AREA 22
#define PTRACE_SET_SYSCALL 23
#define PTRACE_GETHBPREGS 29
#define PTRACE_SETHBPREGS 30
/* AArch32-specific ptrace requests */ /* AArch32-specific ptrace requests */
#define COMPAT_PTRACE_GETREGS 12
#define COMPAT_PTRACE_SETREGS 13
#define COMPAT_PTRACE_GET_THREAD_AREA 22
#define COMPAT_PTRACE_SET_SYSCALL 23
#define COMPAT_PTRACE_GETVFPREGS 27 #define COMPAT_PTRACE_GETVFPREGS 27
#define COMPAT_PTRACE_SETVFPREGS 28 #define COMPAT_PTRACE_SETVFPREGS 28
#define COMPAT_PTRACE_GETHBPREGS 29
#define COMPAT_PTRACE_SETHBPREGS 30
/* /*
* PSR bits * PSR bits

12
arch/arm64/kernel/ptrace.c
View File

@ -1005,7 +1005,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
ret = compat_ptrace_write_user(child, addr, data); ret = compat_ptrace_write_user(child, addr, data);
break; break;
case PTRACE_GETREGS: case COMPAT_PTRACE_GETREGS:
ret = copy_regset_to_user(child, ret = copy_regset_to_user(child,
&user_aarch32_view, &user_aarch32_view,
REGSET_COMPAT_GPR, REGSET_COMPAT_GPR,
@ -1013,7 +1013,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
datap); datap);
break; break;
case PTRACE_SETREGS: case COMPAT_PTRACE_SETREGS:
ret = copy_regset_from_user(child, ret = copy_regset_from_user(child,
&user_aarch32_view, &user_aarch32_view,
REGSET_COMPAT_GPR, REGSET_COMPAT_GPR,
@ -1021,12 +1021,12 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
datap); datap);
break; break;
case PTRACE_GET_THREAD_AREA: case COMPAT_PTRACE_GET_THREAD_AREA:
ret = put_user((compat_ulong_t)child->thread.tp_value, ret = put_user((compat_ulong_t)child->thread.tp_value,
(compat_ulong_t __user *)datap); (compat_ulong_t __user *)datap);
break; break;
case PTRACE_SET_SYSCALL: case COMPAT_PTRACE_SET_SYSCALL:
task_pt_regs(child)->syscallno = data; task_pt_regs(child)->syscallno = data;
ret = 0; ret = 0;
break; break;
@ -1048,11 +1048,11 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
break; break;
#ifdef CONFIG_HAVE_HW_BREAKPOINT #ifdef CONFIG_HAVE_HW_BREAKPOINT
case PTRACE_GETHBPREGS: case COMPAT_PTRACE_GETHBPREGS:
ret = compat_ptrace_gethbpregs(child, addr, datap); ret = compat_ptrace_gethbpregs(child, addr, datap);
break; break;
case PTRACE_SETHBPREGS: case COMPAT_PTRACE_SETHBPREGS:
ret = compat_ptrace_sethbpregs(child, addr, datap); ret = compat_ptrace_sethbpregs(child, addr, datap);
break; break;
#endif #endif