From: Roland McGrath Date: Wed, 30 Jan 2008 12:31:01 +0000 (+0100) Subject: x86: ptrace_32 renamed X-Git-Tag: v2.6.25-rc1~1143^2~668 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d52e9d690fff1fd9d0ccffe375fd01b700f82a64;p=linux-2.6-omap-h63xx.git x86: ptrace_32 renamed This renames ptrace_32.c back to ptrace.c, in preparation for merging the 32/64 versions of these files. Signed-off-by: Roland McGrath Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/kernel/Makefile_32 b/arch/x86/kernel/Makefile_32 index 20e23c4c18b..b2d7aea4c82 100644 --- a/arch/x86/kernel/Makefile_32 +++ b/arch/x86/kernel/Makefile_32 @@ -6,10 +6,11 @@ extra-y := head_32.o init_task.o vmlinux.lds CPPFLAGS_vmlinux.lds += -Ui386 obj-y := process_32.o signal_32.o entry_32.o traps_32.o irq_32.o \ - ptrace_32.o time_32.o ioport_32.o ldt.o setup_32.o i8259_32.o sys_i386_32.o \ + time_32.o ioport_32.o ldt.o setup_32.o i8259_32.o sys_i386_32.o \ pci-dma_32.o i386_ksyms_32.o i387_32.o bootflag.o e820_32.o\ quirks.o i8237.o topology.o alternative.o i8253.o tsc_32.o io_delay.o rtc.o +obj-y += ptrace.o obj-y += tls.o obj-y += step.o obj-$(CONFIG_STACKTRACE) += stacktrace.o diff --git a/arch/x86/kernel/ptrace_32.c b/arch/x86/kernel/ptrace.c similarity index 100% rename from arch/x86/kernel/ptrace_32.c rename to arch/x86/kernel/ptrace.c