summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/i386/Makefile2
-rw-r--r--arch/i386/kernel/Makefile2
-rw-r--r--arch/i386/kernel/init_task_32.c (renamed from arch/i386/kernel/init_task.c)0
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 1bada3d..56ea425 100644
--- a/arch/i386/Makefile
+++ b/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/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index e0ea18f..71138e9 100644
--- a/arch/i386/kernel/Makefile
+++ b/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/arch/i386/kernel/init_task.c b/arch/i386/kernel/init_task_32.c
index d26fc06..d26fc06 100644
--- a/arch/i386/kernel/init_task.c
+++ b/arch/i386/kernel/init_task_32.c
OpenPOWER on IntegriCloud