Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27aa55c5 authored by Will Deacon's avatar Will Deacon Committed by Catalin Marinas
Browse files

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



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: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 0d0109a4

arch/arm64/include/asm/ptrace.h

+6 −11
Original line number Diff line number Diff line
@@ -23,20 +23,15 @@ 


#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 */

#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_SETVFPREGS	28

#define COMPAT_PTRACE_GETHBPREGS	29

#define COMPAT_PTRACE_SETHBPREGS	30



/*

 * PSR bits

arch/arm64/kernel/ptrace.c

+6 −6
Original line number Diff line number Diff line
@@ -1005,7 +1005,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, 
			ret = compat_ptrace_write_user(child, addr, data);

			break;



		case PTRACE_GETREGS:

		case COMPAT_PTRACE_GETREGS:

			ret = copy_regset_to_user(child,

						  &user_aarch32_view,

						  REGSET_COMPAT_GPR,
@@ -1013,7 +1013,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, 
						  datap);

			break;



		case PTRACE_SETREGS:

		case COMPAT_PTRACE_SETREGS:

			ret = copy_regset_from_user(child,

						    &user_aarch32_view,

						    REGSET_COMPAT_GPR,
@@ -1021,12 +1021,12 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, 
						    datap);

			break;



		case PTRACE_GET_THREAD_AREA:

		case COMPAT_PTRACE_GET_THREAD_AREA:

			ret = put_user((compat_ulong_t)child->thread.tp_value,

				       (compat_ulong_t __user *)datap);

			break;



		case PTRACE_SET_SYSCALL:

		case COMPAT_PTRACE_SET_SYSCALL:

			task_pt_regs(child)->syscallno = data;

			ret = 0;

			break;
@@ -1048,11 +1048,11 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, 
			break;



#ifdef CONFIG_HAVE_HW_BREAKPOINT

		case PTRACE_GETHBPREGS:

		case COMPAT_PTRACE_GETHBPREGS:

			ret = compat_ptrace_gethbpregs(child, addr, datap);

			break;



		case PTRACE_SETHBPREGS:

		case COMPAT_PTRACE_SETHBPREGS:

			ret = compat_ptrace_sethbpregs(child, addr, datap);

			break;

#endif