---

yaml --- r: 302804 b: refs/heads/master c: ab5fc1f h: refs/heads/master v: v3
git-mirror · May 5, 2012 · 8d90bb2 · 8d90bb2
1 parent 6e12963
commit 8d90bb2
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 37 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7433c5cf4f69e0b9e648bfb59d65ffe39220e86c
+refs/heads/master: ab5fc1ffb97e670226166f31e61a2cdc51dd2edc
diff --git a/trunk/arch/m68k/Kconfig b/trunk/arch/m68k/Kconfig
@@ -8,6 +8,7 @@ config M68K
 	select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
 	select GENERIC_CPU_DEVICES
 	select FPU if MMU
+	select HAVE_GENERIC_INIT_TASK
 
 config RWSEM_GENERIC_SPINLOCK
 	bool

diff --git a/trunk/arch/m68k/kernel/Makefile b/trunk/arch/m68k/kernel/Makefile
@@ -13,7 +13,7 @@ extra-$(CONFIG_SUN3X)	:= head.o
 extra-$(CONFIG_SUN3)	:= sun3-head.o
 extra-y			+= vmlinux.lds
 
-obj-y	:= entry.o init_task.o irq.o m68k_ksyms.o module.o process.o ptrace.o
+obj-y	:= entry.o irq.o m68k_ksyms.o module.o process.o ptrace.o
 obj-y	+= setup.o signal.o sys_m68k.o syscalltable.o time.o traps.o
 
 obj-$(CONFIG_MMU_MOTOROLA) += ints.o vectors.o

diff --git a/trunk/arch/m68k/kernel/init_task.c b/trunk/arch/m68k/kernel/init_task.c