From 3fff7ace6790213bd2a5cf0b8d66c4d2a46dfedb Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:13:02 +0200 Subject: [PATCH] --- yaml --- r: 65399 b: refs/heads/master c: 6ddf19584021f3c5774823278d42ee3f3124b650 h: refs/heads/master i: 65397: 887ef1cdba3b3bc70fd2f7a4a9fc66d9bbee1e3f 65395: f50f28839377f455e3d58071b19d3b988c9f9289 65391: 11410c1427e510c1c0e722b36fb86e2cbfa5a6fe v: v3 --- [refs] | 2 +- trunk/arch/i386/Makefile | 2 +- trunk/arch/i386/kernel/Makefile | 2 +- trunk/arch/i386/kernel/{init_task.c => init_task_32.c} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename trunk/arch/i386/kernel/{init_task.c => init_task_32.c} (100%) diff --git a/[refs] b/[refs] index b4687a8caa7b..54b309c39296 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c67e102ea427341ca51e0943eb3c5a911d05301 +refs/heads/master: 6ddf19584021f3c5774823278d42ee3f3124b650 diff --git a/trunk/arch/i386/Makefile b/trunk/arch/i386/Makefile index 1bada3d878b7..56ea4250f982 100644 --- a/trunk/arch/i386/Makefile +++ b/trunk/arch/i386/Makefile @@ -99,7 +99,7 @@ core-$(CONFIG_XEN) += arch/i386/xen/ # default subarch .h files mflags-y += -Iinclude/asm-i386/mach-default -head-y := arch/i386/kernel/head.o arch/i386/kernel/init_task.o +head-y := arch/i386/kernel/head.o arch/i386/kernel/init_task_32.o libs-y += arch/i386/lib/ core-y += arch/i386/kernel/ \ diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile index e0ea18f12071..71138e9731f7 100644 --- a/trunk/arch/i386/kernel/Makefile +++ b/trunk/arch/i386/kernel/Makefile @@ -2,7 +2,7 @@ # Makefile for the linux kernel. # -extra-y := head.o init_task.o vmlinux.lds +extra-y := head.o init_task_32.o vmlinux.lds obj-y := process.o signal_32.o entry.o traps_32.o irq_32.o \ ptrace_32.o time_32.o ioport_32.o ldt_32.o setup_32.o i8259_32.o sys_i386_32.o \ diff --git a/trunk/arch/i386/kernel/init_task.c b/trunk/arch/i386/kernel/init_task_32.c similarity index 100% rename from trunk/arch/i386/kernel/init_task.c rename to trunk/arch/i386/kernel/init_task_32.c