---

yaml --- r: 324158 b: refs/heads/master c: 27aa55c h: refs/heads/master v: v3
git-mirror · Sep 27, 2012 · e42a89d · e42a89d
1 parent 2b0ed70
commit e42a89d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d0109a440ea211e398118752c26d4bad540e604
+refs/heads/master: 27aa55c5e5123fa8b8ad0156559d34d7edff58ca
diff --git a/trunk/arch/arm64/include/asm/ptrace.h b/trunk/arch/arm64/include/asm/ptrace.h
@@ -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

diff --git a/trunk/arch/arm64/kernel/ptrace.c b/trunk/arch/arm64/kernel/ptrace.c
@@ -1005,28 +1005,28 @@ 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,
 						  0, sizeof(compat_elf_gregset_t),
 						  datap);
 			break;
 
-		case PTRACE_SETREGS:
+		case COMPAT_PTRACE_SETREGS:
 			ret = copy_regset_from_user(child,
 						    &user_aarch32_view,
 						    REGSET_COMPAT_GPR,
 						    0, sizeof(compat_elf_gregset_t),
 						    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