summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7433c5c)
raw | patch | inline | side by side (parent: 7433c5c)
author | Thomas Gleixner <tglx@linutronix.de> | |
Thu, 3 May 2012 09:02:54 +0000 (09:02 +0000) | ||
committer | Thomas Gleixner <tglx@linutronix.de> | |
Sat, 5 May 2012 11:00:23 +0000 (13:00 +0200) |
Same code. Use the generic version.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Link: http://lkml.kernel.org/r/20120503085034.816195285@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Link: http://lkml.kernel.org/r/20120503085034.816195285@linutronix.de
arch/m68k/Kconfig | patch | blob | history | |
arch/m68k/kernel/Makefile | patch | blob | history | |
arch/m68k/kernel/init_task.c | [deleted file] | patch | blob | history |
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index d318c606c8883d20c8b7e3230d71852091d8a3c6..1891127c7db0c741a1893631354edf9be9c3267a 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
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
index 40d29a788b05e24aa6885ba65639c8bcb5073480..5c7070e21eb76cf42b75b9d5c72cde87d9f00f56 100644 (file)
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/arch/m68k/kernel/init_task.c b/arch/m68k/kernel/init_task.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * linux/arch/m68knommu/kernel/init_task.c
- */
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/init.h>
-#include <linux/init_task.h>
-#include <linux/fs.h>
-#include <linux/mqueue.h>
-
-#include <asm/uaccess.h>
-#include <asm/pgtable.h>
-
-static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
-static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
-/*
- * Initial task structure.
- *
- * All other task structs will be allocated on slabs in fork.c
- */
-struct task_struct init_task = INIT_TASK(init_task);
-
-EXPORT_SYMBOL(init_task);
-
-/*
- * Initial thread structure.
- *
- * We need to make sure that this is THREAD size aligned due to the
- * way process stacks are handled. This is done by having a special
- * "init_task" linker map entry..
- */
-union thread_union init_thread_union __init_task_data =
- { INIT_THREAD_INFO(init_task) };
-