From: tip-bot for Thomas Gleixner <tglx@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
sam@ravnborg.org, tglx@linutronix.de, davem@davemloft.net
Subject: [tip:smp/hotplug] sparc: Use generic init_task
Date: Sat, 5 May 2012 12:06:58 -0700 [thread overview]
Message-ID: <tip-3f149aa226e39e7f29ca7bb22f8e5bf304206a8f@git.kernel.org> (raw)
In-Reply-To: <20120503085035.463573011@linutronix.de>
Commit-ID: 3f149aa226e39e7f29ca7bb22f8e5bf304206a8f
Gitweb: http://git.kernel.org/tip/3f149aa226e39e7f29ca7bb22f8e5bf304206a8f
Author: Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Thu, 3 May 2012 09:02:59 +0000
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Sat, 5 May 2012 13:00:25 +0200
sparc: Use generic init_task
Same code. Use the generic version.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: "David S. Miller" <davem@davemloft.net>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Link: http://lkml.kernel.org/r/20120503085035.463573011@linutronix.de
---
arch/sparc/Kconfig | 1 +
arch/sparc/Makefile | 1 -
arch/sparc/kernel/Makefile | 1 -
arch/sparc/kernel/init_task.c | 22 ----------------------
4 files changed, 1 insertions(+), 24 deletions(-)
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index e417f35..99aad7c 100644
--- a/arch/sparc/Kconfig
+++ b/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/arch/sparc/Makefile b/arch/sparc/Makefile
index eddcfb3..cf39aaf 100644
--- a/arch/sparc/Makefile
+++ b/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/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
index cb85458..9c74bdc 100644
--- a/arch/sparc/kernel/Makefile
+++ b/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/arch/sparc/kernel/init_task.c b/arch/sparc/kernel/init_task.c
deleted file mode 100644
index 35f141a..0000000
--- a/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) };
next prev parent reply other threads:[~2012-05-05 19:07 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-03 9:02 [patch V2 00/31] init_task: Use a generic init_task variant Thomas Gleixner
2012-05-03 9:02 ` [patch V2 01/31] frv: Use correct size for task_struct allocation Thomas Gleixner
2012-05-05 18:46 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 02/31] frv: Use core allocator for task_struct Thomas Gleixner
2012-05-05 18:47 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 03/31] task_allocator: Use config switches instead of magic defines Thomas Gleixner
2012-05-03 9:02 ` [patch V2 04/31] init_task: Create generic init_task instance Thomas Gleixner
2012-05-05 18:49 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 05/31] alpha: Use generic init_task Thomas Gleixner
2012-05-05 18:50 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 06/31] arm: " Thomas Gleixner
2012-05-05 18:51 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 07/31] avr32: " Thomas Gleixner
2012-05-05 18:51 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 08/31] blackfin: " Thomas Gleixner
2012-05-05 18:52 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 10/31] cris: " Thomas Gleixner
2012-05-05 18:54 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 09/31] cx6: " Thomas Gleixner
2012-05-03 13:45 ` Mark Salter
2012-05-03 15:25 ` Thomas Gleixner
2012-05-05 18:53 ` [tip:smp/hotplug] c6x: " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 11/31] frv: " Thomas Gleixner
2012-05-05 18:55 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 12/31] h8300: " Thomas Gleixner
2012-05-05 18:56 ` [tip:smp/hotplug] h8300-use-generic-init_task tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 14/31] m32r: Use generic init_task Thomas Gleixner
2012-05-05 18:57 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 13/31] hexagon: Use generic idle_task Thomas Gleixner
2012-05-05 18:56 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 15/31] m68k: Use generic init_task Thomas Gleixner
2012-05-05 18:58 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 16/31] microblaze: " Thomas Gleixner
2012-05-05 18:59 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 17/31] mips: " Thomas Gleixner
2012-05-05 19:00 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 19/31] openrisc: " Thomas Gleixner
2012-05-05 19:01 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-08 9:37 ` [patch V2 19/31] " Jonas Bonn
2012-05-03 9:02 ` [patch V2 18/31] mn10300: " Thomas Gleixner
2012-05-05 19:01 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 21/31] powerpc: " Thomas Gleixner
2012-05-05 19:03 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 20/31] parisc: " Thomas Gleixner
2012-05-05 19:02 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 22/31] s390: " Thomas Gleixner
2012-05-03 10:00 ` Heiko Carstens
2012-05-05 19:04 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 23/31] score: " Thomas Gleixner
2012-05-05 19:05 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 26/31] tile: " Thomas Gleixner
2012-05-05 19:07 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 24/31] sh: " Thomas Gleixner
2012-05-05 19:06 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 25/31] sparc: " Thomas Gleixner
2012-05-05 19:06 ` tip-bot for Thomas Gleixner [this message]
2012-05-03 9:03 ` [patch V2 27/31] um: " Thomas Gleixner
2012-05-05 19:09 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:03 ` [patch V2 28/31] unicore32: " Thomas Gleixner
2012-05-05 19:08 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:03 ` [patch V2 29/31] x86: " Thomas Gleixner
2012-05-05 19:10 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:03 ` [patch V2 30/31] xtensa: " Thomas Gleixner
2012-05-05 19:11 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:03 ` [patch V2 31/31] init_task: Replace CONFIG_HAVE_GENERIC_INIT_TASK Thomas Gleixner
2012-05-05 19:11 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-04 17:28 ` [patch V2 03/31] task_allocator: Use config switches instead of magic defines David Howells
2012-05-05 10:54 ` Thomas Gleixner
2012-05-04 17:30 ` [patch V2 02/31] frv: Use core allocator for task_struct David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-3f149aa226e39e7f29ca7bb22f8e5bf304206a8f@git.kernel.org \
--to=tglx@linutronix.de \
--cc=davem@davemloft.net \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=sam@ravnborg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.