From cbc9d9d98215f08ed998228e7bce88502d1ce360 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 30 Jan 2008 13:31:02 +0100 Subject: [PATCH] x86: x86 ptrace merge complete This switches over the 64-bit build to use the shared ptrace code, instead of the old ptrace_64.c and arch/x86/ia32/ptrace32.c code. Signed-off-by: Roland McGrath Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- arch/x86/ia32/Makefile | 2 +- arch/x86/kernel/Makefile_64 | 3 ++- include/asm-x86/ptrace.h | 3 --- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/x86/ia32/Makefile b/arch/x86/ia32/Makefile index ea608864084..ec71cfeac87 100644 --- a/arch/x86/ia32/Makefile +++ b/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/arch/x86/kernel/Makefile_64 b/arch/x86/kernel/Makefile_64 index d908f0175e7..b41e838dc78 100644 --- a/arch/x86/kernel/Makefile_64 +++ b/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/include/asm-x86/ptrace.h b/include/asm-x86/ptrace.h index 1b7a8b8d6f6..9228870f615 100644 --- a/include/asm-x86/ptrace.h +++ b/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); -- 2.41.1