---

yaml --- r: 302807 b: refs/heads/master c: fe285f5 h: refs/heads/master i: 302805: cc41f76 302803: 6e12963 302799: 67768c0 v: v3
git-mirror · May 5, 2012 · bca952d · bca952d
1 parent cc74f30
commit bca952d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 42 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 957b369c3d35d73e1d0c3e9d21db791e58984cbb
+refs/heads/master: fe285f523bc13185da6d4c740655b2c27c75cf13
diff --git a/trunk/arch/mn10300/Kconfig b/trunk/arch/mn10300/Kconfig
@@ -6,6 +6,7 @@ config MN10300
 	select HAVE_ARCH_TRACEHOOK
 	select HAVE_ARCH_KGDB
 	select HAVE_NMI_WATCHDOG if MN10300_WD_TIMER
+	select HAVE_GENERIC_INIT_TASK
 
 config AM33_2
 	def_bool n

diff --git a/trunk/arch/mn10300/Makefile b/trunk/arch/mn10300/Makefile
@@ -51,7 +51,7 @@ UNIT		:= asb2364
 endif
 
 
-head-y		:= arch/mn10300/kernel/head.o arch/mn10300/kernel/init_task.o
+head-y		:= arch/mn10300/kernel/head.o
 
 core-y		+= arch/mn10300/kernel/ arch/mn10300/mm/
 

diff --git a/trunk/arch/mn10300/kernel/Makefile b/trunk/arch/mn10300/kernel/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the MN10300-specific core kernel code
 #
-extra-y := head.o init_task.o vmlinux.lds
+extra-y := head.o vmlinux.lds
 
 fpu-obj-y := fpu-nofpu.o fpu-nofpu-low.o
 fpu-obj-$(CONFIG_FPU) := fpu.o fpu-low.o

diff --git a/trunk/arch/mn10300/kernel/init_task.c b/trunk/arch/mn10300/kernel/init_task.c
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,7 +51,7 @@ UNIT := asb2364 @@
     endif
-    head-y		:= arch/mn10300/kernel/head.o arch/mn10300/kernel/init_task.o
+    head-y		:= arch/mn10300/kernel/head.o
     core-y		+= arch/mn10300/kernel/ arch/mn10300/mm/
@@ Expand Down @@