From 52306cca8ea3c3eabe5ad6f9c6baa0ef053bf38b Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Wed, 30 Jan 2008 13:31:01 +0100
Subject: [PATCH] --- yaml --- r: 79907 b: refs/heads/master c:
 d52e9d690fff1fd9d0ccffe375fd01b700f82a64 h: refs/heads/master i:   79905:
 4f8173ae46149fd243f04941c5fea3f748b58970   79903:
 39fe3547681a2661901f82da6095fb6d6eaa3894 v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/x86/kernel/Makefile_32               | 3 ++-
 trunk/arch/x86/kernel/{ptrace_32.c => ptrace.c} | 0
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename trunk/arch/x86/kernel/{ptrace_32.c => ptrace.c} (100%)

diff --git a/[refs] b/[refs]
index 9a4c100facbc..1adb93e6626c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f5340933f9bacb403f49baaf8073320e3984841
+refs/heads/master: d52e9d690fff1fd9d0ccffe375fd01b700f82a64
diff --git a/trunk/arch/x86/kernel/Makefile_32 b/trunk/arch/x86/kernel/Makefile_32
index 20e23c4c18b6..b2d7aea4c82d 100644
--- a/trunk/arch/x86/kernel/Makefile_32
+++ b/trunk/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/trunk/arch/x86/kernel/ptrace_32.c b/trunk/arch/x86/kernel/ptrace.c
similarity index 100%
rename from trunk/arch/x86/kernel/ptrace_32.c
rename to trunk/arch/x86/kernel/ptrace.c