From 5b08b3009b97e877fead0aeea086a20b08a02956 Mon Sep 17 00:00:00 2001
From: Jeff Dike <jdike@addtoit.com>
Date: Mon, 25 Sep 2006 23:33:10 -0700
Subject: [PATCH] --- yaml --- r: 35710 b: refs/heads/master c:
 e8df8c3304cfc7d68e9a6a7b6df6c64783cd6991 h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/include/asm-um/ptrace-generic.h | 14 +-------------
 trunk/include/asm-um/ptrace-x86_64.h  |  4 ----
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 8949bde9a021..90cc368fcc98 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70e0eb8ef143f3729065c504177413ffe165af22
+refs/heads/master: e8df8c3304cfc7d68e9a6a7b6df6c64783cd6991
diff --git a/trunk/include/asm-um/ptrace-generic.h b/trunk/include/asm-um/ptrace-generic.h
index a36f5371b36b..99c87c5ce994 100644
--- a/trunk/include/asm-um/ptrace-generic.h
+++ b/trunk/include/asm-um/ptrace-generic.h
@@ -8,19 +8,7 @@
 
 #ifndef __ASSEMBLY__
 
-
-#define pt_regs pt_regs_subarch
-#define show_regs show_regs_subarch
-#define send_sigtrap send_sigtrap_subarch
-
-#include "asm/arch/ptrace.h"
-
-#undef pt_regs
-#undef show_regs
-#undef send_sigtrap
-#undef user_mode
-#undef instruction_pointer
-
+#include "asm/arch/ptrace-abi.h"
 #include "sysdep/ptrace.h"
 
 struct pt_regs {
diff --git a/trunk/include/asm-um/ptrace-x86_64.h b/trunk/include/asm-um/ptrace-x86_64.h
index c894e68b1f96..2074483e6ca4 100644
--- a/trunk/include/asm-um/ptrace-x86_64.h
+++ b/trunk/include/asm-um/ptrace-x86_64.h
@@ -11,15 +11,11 @@
 #include "asm/errno.h"
 #include "asm/host_ldt.h"
 
-#define signal_fault signal_fault_x86_64
 #define __FRAME_OFFSETS /* Needed to get the R* macros */
 #include "asm/ptrace-generic.h"
-#undef signal_fault
 
 #define HOST_AUDIT_ARCH AUDIT_ARCH_X86_64
 
-void signal_fault(struct pt_regs_subarch *regs, void *frame, char *where);
-
 #define FS_BASE (21 * sizeof(unsigned long))
 #define GS_BASE (22 * sizeof(unsigned long))
 #define DS (23 * sizeof(unsigned long))