From 8ccbca76edb69a39e835174ac907078449b22fca Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 3 May 2012 09:02:53 +0000
Subject: [PATCH] --- yaml --- r: 302801 b: refs/heads/master c:
 a3b3aa3d9d5d482ac68477c69fc08cadbc43e074 h: refs/heads/master i:   302799:
 67768c0a79c7f7c2164773495d1d0ea9e6767ed1 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/h8300/Kconfig            |  1 +
 trunk/arch/h8300/kernel/Makefile    |  2 +-
 trunk/arch/h8300/kernel/init_task.c | 36 -----------------------------
 4 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 trunk/arch/h8300/kernel/init_task.c

diff --git a/[refs] b/[refs]
index f4cb3020a97d..4dd43f5f9d51 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb0fcba283a98f8438ca69b76b0dcb92cce5a951
+refs/heads/master: a3b3aa3d9d5d482ac68477c69fc08cadbc43e074
diff --git a/trunk/arch/h8300/Kconfig b/trunk/arch/h8300/Kconfig
index 56e890df5053..5fac425aece4 100644
--- a/trunk/arch/h8300/Kconfig
+++ b/trunk/arch/h8300/Kconfig
@@ -5,6 +5,7 @@ config H8300
 	select HAVE_GENERIC_HARDIRQS
 	select GENERIC_IRQ_SHOW
 	select GENERIC_CPU_DEVICES
+	select HAVE_GENERIC_INIT_TASK
 
 config SYMBOL_PREFIX
 	string
diff --git a/trunk/arch/h8300/kernel/Makefile b/trunk/arch/h8300/kernel/Makefile
index 8d4d2a54be9e..1cc57f872d34 100644
--- a/trunk/arch/h8300/kernel/Makefile
+++ b/trunk/arch/h8300/kernel/Makefile
@@ -6,7 +6,7 @@ extra-y := vmlinux.lds
 
 obj-y := process.o traps.o ptrace.o irq.o \
 	 sys_h8300.o time.o signal.o \
-         setup.o gpio.o init_task.o syscalls.o \
+         setup.o gpio.o syscalls.o \
 	 entry.o timer/
 
 obj-$(CONFIG_MODULES) += module.o h8300_ksyms.o 
diff --git a/trunk/arch/h8300/kernel/init_task.c b/trunk/arch/h8300/kernel/init_task.c
deleted file mode 100644
index 54c1062ee80e..000000000000
--- a/trunk/arch/h8300/kernel/init_task.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  linux/arch/h8300/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
- */
-__asm__(".align 4");
-struct task_struct init_task = INIT_TASK(init_task);
-
-EXPORT_SYMBOL(init_task);
-
-/*
- * Initial thread structure.
- *
- * We need to make sure that this is 8192-byte 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) };
-