From 52a458e79157e0756b36dc7b95074d12e4e5318c Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Wed, 30 Jan 2008 13:31:02 +0100
Subject: [PATCH] --- yaml --- r: 79915 b: refs/heads/master c:
 cbc9d9d98215f08ed998228e7bce88502d1ce360 h: refs/heads/master i:   79913:
 9cb3c44c65d6f4af8a6a5ae9595d82df3caa1de9   79911:
 26c13494a53f5e3b6bb6fbb6841679d08e1d9e1e v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/ia32/Makefile      | 2 +-
 trunk/arch/x86/kernel/Makefile_64 | 3 ++-
 trunk/include/asm-x86/ptrace.h    | 3 ---
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 925d7a94f7a5..7f469c00d671 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 099cd6e9dac84baafdef00c3955ee68e71282f86
+refs/heads/master: cbc9d9d98215f08ed998228e7bce88502d1ce360
diff --git a/trunk/arch/x86/ia32/Makefile b/trunk/arch/x86/ia32/Makefile
index ea6088640847..ec71cfeac87e 100644
--- a/trunk/arch/x86/ia32/Makefile
+++ b/trunk/arch/x86/ia32/Makefile
@@ -3,7 +3,7 @@
 #
 
 obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o \
-	ia32_binfmt.o fpu32.o ptrace32.o
+	ia32_binfmt.o fpu32.o
 
 sysv-$(CONFIG_SYSVIPC) := ipc32.o
 obj-$(CONFIG_IA32_EMULATION) += $(sysv-y)
diff --git a/trunk/arch/x86/kernel/Makefile_64 b/trunk/arch/x86/kernel/Makefile_64
index d908f0175e76..b41e838dc788 100644
--- a/trunk/arch/x86/kernel/Makefile_64
+++ b/trunk/arch/x86/kernel/Makefile_64
@@ -7,12 +7,13 @@ CPPFLAGS_vmlinux.lds += -Ux86_64
 EXTRA_AFLAGS	:= -traditional
 
 obj-y	:= process_64.o signal_64.o entry_64.o traps_64.o irq_64.o \
-		ptrace_64.o time_64.o ioport_64.o ldt.o setup_64.o i8259_64.o sys_x86_64.o \
+		time_64.o ioport_64.o ldt.o setup_64.o i8259_64.o sys_x86_64.o \
 		x8664_ksyms_64.o i387_64.o syscall_64.o vsyscall_64.o \
 		setup64.o bootflag.o e820_64.o reboot_64.o quirks.o i8237.o \
 		pci-dma_64.o pci-nommu_64.o alternative.o hpet.o tsc_64.o bugs_64.o \
 		i8253.o io_delay.o rtc.o
 
+obj-y				+= ptrace.o
 obj-y				+= step.o
 
 obj-$(CONFIG_IA32_EMULATION)	+= tls.o
diff --git a/trunk/include/asm-x86/ptrace.h b/trunk/include/asm-x86/ptrace.h
index 1b7a8b8d6f60..9228870f6157 100644
--- a/trunk/include/asm-x86/ptrace.h
+++ b/trunk/include/asm-x86/ptrace.h
@@ -164,9 +164,6 @@ void signal_fault(struct pt_regs *regs, void __user *frame, char *where);
 
 struct task_struct;
 
-extern unsigned long ptrace_get_debugreg(struct task_struct *child, int n);
-extern int ptrace_set_debugreg(struct task_struct *child, int n, unsigned long);
-
 extern unsigned long
 convert_rip_to_linear(struct task_struct *child, struct pt_regs *regs);