---

yaml --- r: 65399 b: refs/heads/master c: 6ddf195 h: refs/heads/master i: 65397: 887ef1c 65395: f50f288 65391: 11410c1 v: v3
git-mirror · Oct 11, 2007 · 3fff7ac · 3fff7ac
1 parent 3c6b759
commit 3fff7ac
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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 → trunk/arch/i386/kernel/init_task_32.c b/trunk/arch/i386/kernel/init_task.c → trunk/arch/i386/kernel/init_task_32.c