From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Subject: [patch V2 31/31] init_task: Replace CONFIG_HAVE_GENERIC_INIT_TASK
Date: Thu, 03 May 2012 09:03:02 -0000 [thread overview]
Message-ID: <20120503085035.867948914@linutronix.de> (raw)
In-Reply-To: 20120503083859.991965503@linutronix.de
[-- Attachment #1: init-task-remove-config.patch --]
[-- Type: text/plain, Size: 12277 bytes --]
Now that all archs except ia64 are converted, replace the config and
let the ia64 select CONFIG_ARCH_INIT_TASK
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/Kconfig | 2 +-
arch/alpha/Kconfig | 1 -
arch/arm/Kconfig | 1 -
arch/avr32/Kconfig | 1 -
arch/blackfin/Kconfig | 1 -
arch/c6x/Kconfig | 1 -
arch/cris/Kconfig | 1 -
arch/frv/Kconfig | 1 -
arch/h8300/Kconfig | 1 -
arch/hexagon/Kconfig | 1 -
arch/ia64/Kconfig | 1 +
arch/m32r/Kconfig | 1 -
arch/m68k/Kconfig | 1 -
arch/microblaze/Kconfig | 1 -
arch/mips/Kconfig | 1 -
arch/mn10300/Kconfig | 1 -
arch/openrisc/Kconfig | 1 -
arch/parisc/Kconfig | 1 -
arch/powerpc/Kconfig | 1 -
arch/s390/Kconfig | 1 -
arch/score/Kconfig | 1 -
arch/sh/Kconfig | 1 -
arch/sparc/Kconfig | 1 -
arch/tile/Kconfig | 1 -
arch/um/Kconfig.common | 1 -
arch/unicore32/Kconfig | 1 -
arch/x86/Kconfig | 1 -
arch/xtensa/Kconfig | 1 -
init/Makefile | 5 ++++-
29 files changed, 6 insertions(+), 28 deletions(-)
Index: tip/arch/Kconfig
===================================================================
--- tip.orig/arch/Kconfig
+++ tip/arch/Kconfig
@@ -148,7 +148,7 @@ config USE_GENERIC_SMP_HELPERS
config GENERIC_SMP_IDLE_THREAD
bool
-config HAVE_GENERIC_INIT_TASK
+config ARCH_INIT_TASK
bool
config HAVE_REGS_AND_STACK_ACCESS_API
Index: tip/arch/alpha/Kconfig
===================================================================
--- tip.orig/arch/alpha/Kconfig
+++ tip/arch/alpha/Kconfig
@@ -16,7 +16,6 @@ config ALPHA
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select GENERIC_SMP_IDLE_THREAD
- select HAVE_GENERIC_INIT_TASK
help
The Alpha is a 64-bit general-purpose processor designed and
marketed by the Digital Equipment Corporation of blessed memory,
Index: tip/arch/arm/Kconfig
===================================================================
--- tip.orig/arch/arm/Kconfig
+++ tip/arch/arm/Kconfig
@@ -35,7 +35,6 @@ config ARM
select GENERIC_PCI_IOMAP
select HAVE_BPF_JIT if NET
select GENERIC_SMP_IDLE_THREAD
- select HAVE_GENERIC_INIT_TASK
help
The ARM series is a line of low-power-consumption RISC chip designs
licensed by ARM Ltd and targeted at embedded applications and
Index: tip/arch/avr32/Kconfig
===================================================================
--- tip.orig/arch/avr32/Kconfig
+++ tip/arch/avr32/Kconfig
@@ -12,7 +12,6 @@ config AVR32
select HARDIRQS_SW_RESEND
select GENERIC_IRQ_SHOW
select ARCH_HAVE_NMI_SAFE_CMPXCHG
- select HAVE_GENERIC_INIT_TASK
help
AVR32 is a high-performance 32-bit RISC microprocessor core,
designed for cost-sensitive embedded applications, with particular
Index: tip/arch/blackfin/Kconfig
===================================================================
--- tip.orig/arch/blackfin/Kconfig
+++ tip/arch/blackfin/Kconfig
@@ -38,7 +38,6 @@ config BLACKFIN
select IRQ_PER_CPU if SMP
select HAVE_NMI_WATCHDOG if NMI_WATCHDOG
select GENERIC_SMP_IDLE_THREAD
- select HAVE_GENERIC_INIT_TASK
config GENERIC_CSUM
def_bool y
Index: tip/arch/c6x/Kconfig
===================================================================
--- tip.orig/arch/c6x/Kconfig
+++ tip/arch/c6x/Kconfig
@@ -15,7 +15,6 @@ config TMS320C6X
select IRQ_DOMAIN
select OF
select OF_EARLY_FLATTREE
- select HAVE_GENERIC_INIT_TASK
config MMU
def_bool n
Index: tip/arch/cris/Kconfig
===================================================================
--- tip.orig/arch/cris/Kconfig
+++ tip/arch/cris/Kconfig
@@ -50,7 +50,6 @@ config CRIS
select GENERIC_IRQ_SHOW
select GENERIC_IOMAP
select GENERIC_SMP_IDLE_THREAD if ETRAX_ARCH_V32
- select HAVE_GENERIC_INIT_TASK
config HZ
int
Index: tip/arch/frv/Kconfig
===================================================================
--- tip.orig/arch/frv/Kconfig
+++ tip/arch/frv/Kconfig
@@ -10,7 +10,6 @@ config FRV
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select GENERIC_CPU_DEVICES
select ARCH_THREAD_INFO_ALLOCATOR
- select HAVE_GENERIC_INIT_TASK
config ZONE_DMA
bool
Index: tip/arch/h8300/Kconfig
===================================================================
--- tip.orig/arch/h8300/Kconfig
+++ tip/arch/h8300/Kconfig
@@ -5,7 +5,6 @@ config H8300
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_SHOW
select GENERIC_CPU_DEVICES
- select HAVE_GENERIC_INIT_TASK
config SYMBOL_PREFIX
string
Index: tip/arch/hexagon/Kconfig
===================================================================
--- tip.orig/arch/hexagon/Kconfig
+++ tip/arch/hexagon/Kconfig
@@ -28,7 +28,6 @@ config HEXAGON
select NO_IOPORT
select GENERIC_IOMAP
select GENERIC_SMP_IDLE_THREAD
- select HAVE_GENERIC_INIT_TASK
# mostly generic routines, with some accelerated ones
---help---
Qualcomm Hexagon is a processor architecture designed for high
Index: tip/arch/ia64/Kconfig
===================================================================
--- tip.orig/arch/ia64/Kconfig
+++ tip/arch/ia64/Kconfig
@@ -36,6 +36,7 @@ config IA64
select GENERIC_SMP_IDLE_THREAD
select ARCH_TASK_STRUCT_ALLOCATOR
select ARCH_THREAD_INFO_ALLOCATOR
+ select ARCH_INIT_TASK
default y
help
The Itanium Processor Family is Intel's 64-bit successor to
Index: tip/arch/m32r/Kconfig
===================================================================
--- tip.orig/arch/m32r/Kconfig
+++ tip/arch/m32r/Kconfig
@@ -11,7 +11,6 @@ config M32R
select GENERIC_IRQ_PROBE
select GENERIC_IRQ_SHOW
select GENERIC_ATOMIC64
- select HAVE_GENERIC_INIT_TASK
config SBUS
bool
Index: tip/arch/m68k/Kconfig
===================================================================
--- tip.orig/arch/m68k/Kconfig
+++ tip/arch/m68k/Kconfig
@@ -8,7 +8,6 @@ config M68K
select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
select GENERIC_CPU_DEVICES
select FPU if MMU
- select HAVE_GENERIC_INIT_TASK
config RWSEM_GENERIC_SPINLOCK
bool
Index: tip/arch/microblaze/Kconfig
===================================================================
--- tip.orig/arch/microblaze/Kconfig
+++ tip/arch/microblaze/Kconfig
@@ -22,7 +22,6 @@ config MICROBLAZE
select GENERIC_PCI_IOMAP
select GENERIC_CPU_DEVICES
select GENERIC_ATOMIC64
- select HAVE_GENERIC_INIT_TASK
config SWAP
def_bool n
Index: tip/arch/mips/Kconfig
===================================================================
--- tip.orig/arch/mips/Kconfig
+++ tip/arch/mips/Kconfig
@@ -30,7 +30,6 @@ config MIPS
select HAVE_MEMBLOCK_NODE_MAP
select ARCH_DISCARD_MEMBLOCK
select GENERIC_SMP_IDLE_THREAD
- select HAVE_GENERIC_INIT_TASK
menu "Machine selection"
Index: tip/arch/mn10300/Kconfig
===================================================================
--- tip.orig/arch/mn10300/Kconfig
+++ tip/arch/mn10300/Kconfig
@@ -6,7 +6,6 @@ config MN10300
select HAVE_ARCH_TRACEHOOK
select HAVE_ARCH_KGDB
select HAVE_NMI_WATCHDOG if MN10300_WD_TIMER
- select HAVE_GENERIC_INIT_TASK
config AM33_2
def_bool n
Index: tip/arch/openrisc/Kconfig
===================================================================
--- tip.orig/arch/openrisc/Kconfig
+++ tip/arch/openrisc/Kconfig
@@ -17,7 +17,6 @@ config OPENRISC
select GENERIC_IOMAP
select GENERIC_CPU_DEVICES
select GENERIC_ATOMIC64
- select HAVE_GENERIC_INIT_TASK
config MMU
def_bool y
Index: tip/arch/parisc/Kconfig
===================================================================
--- tip.orig/arch/parisc/Kconfig
+++ tip/arch/parisc/Kconfig
@@ -18,7 +18,6 @@ config PARISC
select IRQ_PER_CPU
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select GENERIC_SMP_IDLE_THREAD
- select HAVE_GENERIC_INIT_TASK
help
The PA-RISC microprocessor is designed by Hewlett-Packard and used
Index: tip/arch/powerpc/Kconfig
===================================================================
--- tip.orig/arch/powerpc/Kconfig
+++ tip/arch/powerpc/Kconfig
@@ -145,7 +145,6 @@ config PPC
select HAVE_ARCH_JUMP_LABEL
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select GENERIC_SMP_IDLE_THREAD
- select HAVE_GENERIC_INIT_TASK
config EARLY_PRINTK
bool
Index: tip/arch/s390/Kconfig
===================================================================
--- tip.orig/arch/s390/Kconfig
+++ tip/arch/s390/Kconfig
@@ -123,7 +123,6 @@ 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/score/Kconfig
===================================================================
--- tip.orig/arch/score/Kconfig
+++ tip/arch/score/Kconfig
@@ -9,7 +9,6 @@ config SCORE
select HAVE_MEMBLOCK_NODE_MAP
select ARCH_DISCARD_MEMBLOCK
select GENERIC_CPU_DEVICES
- select HAVE_GENERIC_INIT_TASK
choice
prompt "System type"
Index: tip/arch/sh/Kconfig
===================================================================
--- tip.orig/arch/sh/Kconfig
+++ tip/arch/sh/Kconfig
@@ -29,7 +29,6 @@ config SUPERH
select GENERIC_ATOMIC64
select GENERIC_IRQ_SHOW
select GENERIC_SMP_IDLE_THREAD
- select HAVE_GENERIC_INIT_TASK
help
The SuperH is a RISC processor targeted for use in embedded systems
and consumer electronics; it was also used in the Sega Dreamcast
Index: tip/arch/sparc/Kconfig
===================================================================
--- tip.orig/arch/sparc/Kconfig
+++ tip/arch/sparc/Kconfig
@@ -31,7 +31,6 @@ 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/tile/Kconfig
===================================================================
--- tip.orig/arch/tile/Kconfig
+++ tip/arch/tile/Kconfig
@@ -13,7 +13,6 @@ config TILE
select GENERIC_IRQ_SHOW
select SYS_HYPERVISOR
select ARCH_HAVE_NMI_SAFE_CMPXCHG
- select HAVE_GENERIC_INIT_TASK
# FIXME: investigate whether we need/want these options.
# select HAVE_IOREMAP_PROT
Index: tip/arch/um/Kconfig.common
===================================================================
--- tip.orig/arch/um/Kconfig.common
+++ tip/arch/um/Kconfig.common
@@ -10,7 +10,6 @@ config UML
select GENERIC_IRQ_SHOW
select GENERIC_CPU_DEVICES
select GENERIC_IO
- select HAVE_GENERIC_INIT_TASK
config MMU
bool
Index: tip/arch/unicore32/Kconfig
===================================================================
--- tip.orig/arch/unicore32/Kconfig
+++ tip/arch/unicore32/Kconfig
@@ -13,7 +13,6 @@ config UNICORE32
select GENERIC_IRQ_SHOW
select ARCH_WANT_FRAME_POINTERS
select GENERIC_IOMAP
- select HAVE_GENERIC_INIT_TASK
help
UniCore-32 is 32-bit Instruction Set Architecture,
including a series of low-power-consumption RISC chip
Index: tip/arch/x86/Kconfig
===================================================================
--- tip.orig/arch/x86/Kconfig
+++ tip/arch/x86/Kconfig
@@ -83,7 +83,6 @@ config X86
select GENERIC_IOMAP
select DCACHE_WORD_ACCESS if !DEBUG_PAGEALLOC
select GENERIC_SMP_IDLE_THREAD
- select HAVE_GENERIC_INIT_TASK
config INSTRUCTION_DECODER
def_bool (KPROBES || PERF_EVENTS)
Index: tip/arch/xtensa/Kconfig
===================================================================
--- tip.orig/arch/xtensa/Kconfig
+++ tip/arch/xtensa/Kconfig
@@ -10,7 +10,6 @@ config XTENSA
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_SHOW
select GENERIC_CPU_DEVICES
- select HAVE_GENERIC_INIT_TASK
help
Xtensa processors are 32-bit RISC machines designed by Tensilica
primarily for embedded systems. These processors are both
Index: tip/init/Makefile
===================================================================
--- tip.orig/init/Makefile
+++ tip/init/Makefile
@@ -9,7 +9,10 @@ else
obj-$(CONFIG_BLK_DEV_INITRD) += initramfs.o
endif
obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o
-obj-$(CONFIG_HAVE_GENERIC_INIT_TASK) += init_task.o
+
+ifneq ($(CONFIG_ARCH_INIT_TASK),y)
+obj-y += init_task.o
+endif
mounts-y := do_mounts.o
mounts-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o
next prev parent reply other threads:[~2012-05-03 9:03 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:smp/hotplug] " tip-bot for Thomas Gleixner
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 ` Thomas Gleixner [this message]
2012-05-05 19:11 ` [tip:smp/hotplug] init_task: Replace CONFIG_HAVE_GENERIC_INIT_TASK 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=20120503085035.867948914@linutronix.de \
--to=tglx@linutronix.de \
--cc=linux-kernel@vger.kernel.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).