From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: linux-arch@vger.kernel.org, Martin Schwidefsky <schwidefsky@de.ibm.com>
Subject: [patch 20/29] s390: Use generic init_task
Date: Mon, 30 Apr 2012 20:16:01 -0000 [thread overview]
Message-ID: <20120430194846.801327557@linutronix.de> (raw)
In-Reply-To: 20120430194725.763322463@linutronix.de
[-- Attachment #1: s390-use-generic-init-task.patch --]
[-- Type: text/plain, Size: 3058 bytes --]
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: Martin Schwidefsky <schwidefsky@de.ibm.com>
---
arch/s390/Kconfig | 1 +
arch/s390/Makefile | 1 -
arch/s390/kernel/Makefile | 2 +-
arch/s390/kernel/init_task.c | 38 --------------------------------------
4 files changed, 2 insertions(+), 40 deletions(-)
Index: tip/arch/s390/Kconfig
===================================================================
--- tip.orig/arch/s390/Kconfig
+++ tip/arch/s390/Kconfig
@@ -123,6 +123,7 @@ config S390
select ARCH_INLINE_WRITE_UNLOCK_IRQ
select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
select GENERIC_SMP_IDLE_THREAD
+ select HAVE_GENERIC_INIT_TASK
config SCHED_OMIT_FRAME_POINTER
def_bool y
Index: tip/arch/s390/Makefile
===================================================================
--- tip.orig/arch/s390/Makefile
+++ tip/arch/s390/Makefile
@@ -91,7 +91,6 @@ OBJCOPYFLAGS := -O binary
head-y := arch/s390/kernel/head.o
head-y += arch/s390/kernel/$(if $(CONFIG_64BIT),head64.o,head31.o)
-head-y += arch/s390/kernel/init_task.o
# See arch/s390/Kbuild for content of core part of the kernel
core-y += arch/s390/
Index: tip/arch/s390/kernel/Makefile
===================================================================
--- tip.orig/arch/s390/kernel/Makefile
+++ tip/arch/s390/kernel/Makefile
@@ -28,7 +28,7 @@ obj-y := bitmap.o traps.o time.o proces
obj-y += $(if $(CONFIG_64BIT),entry64.o,entry.o)
obj-y += $(if $(CONFIG_64BIT),reipl64.o,reipl.o)
-extra-y += head.o init_task.o vmlinux.lds
+extra-y += head.o vmlinux.lds
extra-y += $(if $(CONFIG_64BIT),head64.o,head31.o)
obj-$(CONFIG_MODULES) += s390_ksyms.o module.o
Index: tip/arch/s390/kernel/init_task.c
===================================================================
--- tip.orig/arch/s390/kernel/init_task.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * arch/s390/kernel/init_task.c
- *
- * S390 version
- *
- * Derived from "arch/i386/kernel/init_task.c"
- */
-
-#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/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 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) };
-
-/*
- * 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);
next prev parent reply other threads:[~2012-04-30 20:18 UTC|newest]
Thread overview: 48+ 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 ` [patch 03/29] arm: " Thomas Gleixner
2012-04-30 20:15 ` [patch 04/29] avr32: " Thomas Gleixner
2012-04-30 20:15 ` [patch 06/29] cx6: " Thomas Gleixner
2012-04-30 20:15 ` [patch 05/29] blackfin: " 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-05-02 11:24 ` Jesper Nilsson
2012-04-30 20:15 ` [patch 09/29] h8300: " Thomas Gleixner
2012-04-30 20:15 ` [patch 10/29] hexagon: Use generic idle_task Thomas Gleixner
2012-05-03 0:46 ` Richard Kuo
2012-04-30 20:15 ` [patch 12/29] m32r: Use generic init_task Thomas Gleixner
2012-04-30 20:15 ` [patch 11/29] ia64: " Thomas Gleixner
2012-04-30 20:15 ` [patch 13/29] m68k: " Thomas Gleixner
2012-04-30 20:15 ` [patch 14/29] microblaze: " Thomas Gleixner
2012-04-30 20:15 ` [patch 16/29] mn10300: " Thomas Gleixner
2012-04-30 20:15 ` [patch 15/29] mips: " Thomas Gleixner
2012-04-30 20:16 ` [patch 18/29] parisc: " Thomas Gleixner
2012-04-30 20:16 ` [patch 17/29] openrisc: " Thomas Gleixner
2012-04-30 20:16 ` [patch 19/29] powerpc: " Thomas Gleixner
2012-04-30 22:34 ` Benjamin Herrenschmidt
2012-04-30 20:16 ` Thomas Gleixner [this message]
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-04-30 20:16 ` [patch 24/29] tile: " Thomas Gleixner
2012-04-30 20:16 ` [patch 23/29] sparc: " Thomas Gleixner
2012-04-30 20:35 ` Sam Ravnborg
2012-04-30 20:39 ` Thomas Gleixner
2012-04-30 21:04 ` Thomas Gleixner
2012-04-30 21:10 ` Sam Ravnborg
2012-05-01 1:46 ` David Miller
2012-04-30 20:16 ` [patch 25/29] um: " Thomas Gleixner
2012-04-30 22:06 ` Richard Weinberger
2012-04-30 20:16 ` [patch 26/29] unicore32: " Thomas Gleixner
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:37 ` [patch 00/29] init_task: Use a generic init_task variant 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=20120430194846.801327557@linutronix.de \
--to=tglx@linutronix.de \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=schwidefsky@de.ibm.com \
/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).