From 56eaf2e9201530c709f84a7748ef19c162148e3a Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 3 May 2012 09:02:59 +0000
Subject: [PATCH] --- yaml --- r: 302814 b: refs/heads/master c:
 3f149aa226e39e7f29ca7bb22f8e5bf304206a8f h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/arch/sparc/Kconfig            |  1 +
 trunk/arch/sparc/Makefile           |  1 -
 trunk/arch/sparc/kernel/Makefile    |  1 -
 trunk/arch/sparc/kernel/init_task.c | 22 ----------------------
 5 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 trunk/arch/sparc/kernel/init_task.c

diff --git a/[refs] b/[refs]
index 744ec2a183ea..12bc69d5bc04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41fe22f6553d1384fbef20b195b8c61ed6e768a1
+refs/heads/master: 3f149aa226e39e7f29ca7bb22f8e5bf304206a8f
diff --git a/trunk/arch/sparc/Kconfig b/trunk/arch/sparc/Kconfig
index e417f35d5912..99aad7cd0075 100644
--- a/trunk/arch/sparc/Kconfig
+++ b/trunk/arch/sparc/Kconfig
@@ -31,6 +31,7 @@ config SPARC
 	select GENERIC_PCI_IOMAP
 	select HAVE_NMI_WATCHDOG if SPARC64
 	select GENERIC_SMP_IDLE_THREAD
+	select HAVE_GENERIC_INIT_TASK
 
 config SPARC32
 	def_bool !64BIT
diff --git a/trunk/arch/sparc/Makefile b/trunk/arch/sparc/Makefile
index eddcfb36aafb..cf39aaf24189 100644
--- a/trunk/arch/sparc/Makefile
+++ b/trunk/arch/sparc/Makefile
@@ -62,7 +62,6 @@ endif
 endif
 
 head-y                 := arch/sparc/kernel/head_$(BITS).o
-head-y                 += arch/sparc/kernel/init_task.o
 
 core-y                 += arch/sparc/kernel/
 core-y                 += arch/sparc/mm/ arch/sparc/math-emu/
diff --git a/trunk/arch/sparc/kernel/Makefile b/trunk/arch/sparc/kernel/Makefile
index cb85458f89d2..9c74bdc0349c 100644
--- a/trunk/arch/sparc/kernel/Makefile
+++ b/trunk/arch/sparc/kernel/Makefile
@@ -6,7 +6,6 @@ asflags-y := -ansi
 ccflags-y := -Werror
 
 extra-y     := head_$(BITS).o
-extra-y     += init_task.o
 
 # Undefine sparc when processing vmlinux.lds - it is used
 # And teach CPP we are doing $(BITS) builds (for this case)
diff --git a/trunk/arch/sparc/kernel/init_task.c b/trunk/arch/sparc/kernel/init_task.c
deleted file mode 100644
index 35f141a9f506..000000000000
--- a/trunk/arch/sparc/kernel/init_task.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <linux/mm.h>
-#include <linux/fs.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/init_task.h>
-#include <linux/mqueue.h>
-
-#include <asm/pgtable.h>
-#include <asm/uaccess.h>
-
-static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
-static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
-struct task_struct init_task = INIT_TASK(init_task);
-EXPORT_SYMBOL(init_task);
-
-/* .text section in head.S is aligned at 8k boundary and this gets linked
- * right after that so that the init_thread_union is aligned properly as well.
- * If this is not aligned on a 8k boundary, then you should change code
- * in etrap.S which assumes it.
- */
-union thread_union init_thread_union __init_task_data =
-	{ INIT_THREAD_INFO(init_task) };