---

yaml --- r: 79907 b: refs/heads/master c: d52e9d6 h: refs/heads/master i: 79905: 4f8173a 79903: 39fe354 v: v3
git-mirror · Jan 30, 2008 · 52306cc · 52306cc
1 parent 8c55e72
commit 52306cc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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 → trunk/arch/x86/kernel/ptrace.c b/trunk/arch/x86/kernel/ptrace_32.c → trunk/arch/x86/kernel/ptrace.c