From 116066c96a6c7f5ca74498a46b08423d438762c4 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:12:53 +0200 Subject: [PATCH] --- yaml --- r: 65393 b: refs/heads/master c: 8260dc37916c12b36e9732a8fa5bfa8c5fa8f0c4 h: refs/heads/master i: 65391: 11410c1427e510c1c0e722b36fb86e2cbfa5a6fe v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/Makefile | 2 +- trunk/arch/i386/kernel/{ptrace.c => ptrace_32.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/i386/kernel/{ptrace.c => ptrace_32.c} (100%) diff --git a/[refs] b/[refs] index bd6aaf9dfffc..3431d61f49fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0d557e2c28623c58e645c29f309a823edd7a1bf +refs/heads/master: 8260dc37916c12b36e9732a8fa5bfa8c5fa8f0c4 diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile index ce8dd0ad8a79..b3a8c9aae0ab 100644 --- a/trunk/arch/i386/kernel/Makefile +++ b/trunk/arch/i386/kernel/Makefile @@ -5,7 +5,7 @@ extra-y := head.o init_task.o vmlinux.lds obj-y := process.o signal_32.o entry.o traps_32.o irq.o \ - ptrace.o time_32.o ioport_32.o ldt.o setup_32.o i8259_32.o sys_i386_32.o \ + ptrace_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_32.o tsc.o diff --git a/trunk/arch/i386/kernel/ptrace.c b/trunk/arch/i386/kernel/ptrace_32.c similarity index 100% rename from trunk/arch/i386/kernel/ptrace.c rename to trunk/arch/i386/kernel/ptrace_32.c