From: Thomas Gleixner <tglx@linutronix.de>
To: Sam Ravnborg <sam@ravnborg.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
linux-arch@vger.kernel.org,
"David S. Miller" <davem@davemloft.net>
Subject: Re: [patch 23/29] sparc: Use generic init_task
Date: Mon, 30 Apr 2012 23:04:39 +0200 (CEST) [thread overview]
Message-ID: <alpine.LFD.2.02.1204302303390.6271@ionos> (raw)
In-Reply-To: <alpine.LFD.2.02.1204302239000.6271@ionos>
On Mon, 30 Apr 2012, Thomas Gleixner wrote:
> On Mon, 30 Apr 2012, Sam Ravnborg wrote:
> > This breaks sparc build as it has the following in arch/sparc/Makefile:
> >
> > head-y += arch/sparc/kernel/init_task.o
>
> Hrmm, I thought I had catched all of this nonsense.
Updated version below.
Thanks,
tglx
-------------------->
Subject: sparc: Use generic init_task
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 30 Apr 2012 16:48:55 +0200
Same code. Use the generic version. The special Makefile treatment is
pointless anyway as init_task.o contains only data which is handled by
the linker script. So no point on being treated like head text.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: "David S. Miller" <davem@davemloft.net>
---
arch/sparc/Kconfig | 1 +
arch/sparc/Makefile | 1 -
arch/sparc/kernel/Makefile | 1 -
arch/sparc/kernel/init_task.c | 22 ----------------------
4 files changed, 1 insertion(+), 24 deletions(-)
Index: tip/arch/sparc/Kconfig
===================================================================
--- tip.orig/arch/sparc/Kconfig
+++ tip/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
Index: tip/arch/sparc/Makefile
===================================================================
--- tip.orig/arch/sparc/Makefile
+++ tip/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/
Index: tip/arch/sparc/kernel/Makefile
===================================================================
--- tip.orig/arch/sparc/kernel/Makefile
+++ tip/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)
Index: tip/arch/sparc/kernel/init_task.c
===================================================================
--- tip.orig/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-04-30 21:04 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-30 20:15 [patch 00/29] init_task: Use a generic init_task variant Thomas Gleixner
2012-04-30 20:15 ` [patch 02/29] alpha: Use generic init_task Thomas Gleixner
2012-04-30 20:15 ` Thomas Gleixner
2012-04-30 20:15 ` [patch 04/29] avr32: " Thomas Gleixner
2012-04-30 20:15 ` Thomas Gleixner
2012-04-30 20:15 ` [patch 03/29] arm: " Thomas Gleixner
2012-04-30 20:15 ` [patch 06/29] cx6: " Thomas Gleixner
2012-04-30 20:15 ` Thomas Gleixner
2012-04-30 20:15 ` [patch 05/29] blackfin: " Thomas Gleixner
2012-04-30 20:15 ` Thomas Gleixner
2012-05-06 8:16 ` Mike Frysinger
2012-04-30 20:15 ` [patch 08/29] frv: " Thomas Gleixner
2012-04-30 20:15 ` [patch 07/29] cris: " Thomas Gleixner
2012-04-30 20:15 ` Thomas Gleixner
2012-05-02 11:24 ` Jesper Nilsson
2012-05-02 11:24 ` Jesper Nilsson
2012-04-30 20:15 ` [patch 10/29] hexagon: Use generic idle_task Thomas Gleixner
2012-04-30 20:15 ` Thomas Gleixner
2012-05-03 0:46 ` Richard Kuo
2012-04-30 20:15 ` [patch 09/29] h8300: Use generic init_task Thomas Gleixner
2012-04-30 20:15 ` Thomas Gleixner
2012-04-30 20:15 ` [patch 11/29] ia64: " Thomas Gleixner
2012-04-30 20:15 ` [patch 12/29] m32r: " Thomas Gleixner
2012-04-30 20:15 ` Thomas Gleixner
2012-04-30 20:15 ` [patch 14/29] microblaze: " Thomas Gleixner
2012-04-30 20:15 ` Thomas Gleixner
2012-04-30 20:15 ` [patch 13/29] m68k: " Thomas Gleixner
2012-04-30 20:15 ` Thomas Gleixner
2012-04-30 20:15 ` [patch 15/29] mips: " Thomas Gleixner
2012-04-30 20:15 ` Thomas Gleixner
2012-04-30 20:15 ` [patch 16/29] mn10300: " Thomas Gleixner
2012-04-30 20:15 ` Thomas Gleixner
2012-04-30 20:16 ` [patch 17/29] openrisc: " Thomas Gleixner
2012-04-30 20:16 ` Thomas Gleixner
2012-04-30 20:16 ` [patch 18/29] parisc: " Thomas Gleixner
2012-04-30 20:16 ` [patch 20/29] s390: " Thomas Gleixner
2012-04-30 20:16 ` Thomas Gleixner
2012-04-30 20:16 ` [patch 19/29] powerpc: " Thomas Gleixner
2012-04-30 20:16 ` Thomas Gleixner
2012-04-30 22:34 ` Benjamin Herrenschmidt
2012-04-30 20:16 ` [patch 22/29] sh: " Thomas Gleixner
2012-04-30 22:57 ` Paul Mundt
2012-04-30 20:16 ` [patch 21/29] score: " Thomas Gleixner
2012-04-30 20:21 ` KOSAKI Motohiro
2012-04-30 20:38 ` Thomas Gleixner
2012-04-30 20:49 ` Thomas Gleixner
2012-05-01 13:46 ` KOSAKI Motohiro
2012-05-01 13:46 ` KOSAKI Motohiro
2012-04-30 20:16 ` [patch 23/29] sparc: " Thomas Gleixner
2012-04-30 20:16 ` Thomas Gleixner
2012-04-30 20:35 ` Sam Ravnborg
2012-04-30 20:39 ` Thomas Gleixner
2012-04-30 21:04 ` Thomas Gleixner [this message]
2012-04-30 21:10 ` Sam Ravnborg
2012-05-01 1:46 ` David Miller
2012-04-30 20:16 ` [patch 24/29] tile: " Thomas Gleixner
2012-04-30 20:16 ` Thomas Gleixner
2012-04-30 20:16 ` [patch 26/29] unicore32: " Thomas Gleixner
2012-04-30 20:16 ` Thomas Gleixner
2012-04-30 20:16 ` [patch 25/29] um: " Thomas Gleixner
2012-04-30 22:06 ` Richard Weinberger
2012-04-30 20:16 ` [patch 27/29] x86: " Thomas Gleixner
2012-04-30 20:16 ` [patch 28/29] xtensa: " Thomas Gleixner
2012-04-30 20:16 ` [patch 29/29] init_task: Remove CONFIG_HAVE_GENERIC_INIT_TASK Thomas Gleixner
2012-04-30 20:16 ` Thomas Gleixner
2012-04-30 20:37 ` [patch 00/29] init_task: Use a generic init_task variant Sam Ravnborg
2012-04-30 20:37 ` Sam Ravnborg
2012-04-30 20:43 ` Thomas Gleixner
2012-05-01 15:31 ` Sam Ravnborg
2012-05-02 7:09 ` Heiko Carstens
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=alpine.LFD.2.02.1204302303390.6271@ionos \
--to=tglx@linutronix.de \
--cc=davem@davemloft.net \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).