init_task: Replace CONFIG_HAVE_GENERIC_INIT_TASK
Thomas Gleixner [Thu, 3 May 2012 09:03:02 +0000 (09:03 +0000)]
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>
Link: http://lkml.kernel.org/r/20120503085035.867948914@linutronix.de

29 files changed:
arch/Kconfig
arch/alpha/Kconfig
arch/arm/Kconfig
arch/avr32/Kconfig
arch/blackfin/Kconfig
arch/c6x/Kconfig
arch/cris/Kconfig
arch/frv/Kconfig
arch/h8300/Kconfig
arch/hexagon/Kconfig
arch/ia64/Kconfig
arch/m32r/Kconfig
arch/m68k/Kconfig
arch/microblaze/Kconfig
arch/mips/Kconfig
arch/mn10300/Kconfig
arch/openrisc/Kconfig
arch/parisc/Kconfig
arch/powerpc/Kconfig
arch/s390/Kconfig
arch/score/Kconfig
arch/sh/Kconfig
arch/sparc/Kconfig
arch/tile/Kconfig
arch/um/Kconfig.common
arch/unicore32/Kconfig
arch/x86/Kconfig
arch/xtensa/Kconfig
init/Makefile

index 2dd8fdd..597b132 100644 (file)
@@ -148,7 +148,8 @@ config USE_GENERIC_SMP_HELPERS
 config GENERIC_SMP_IDLE_THREAD
        bool
 
-config HAVE_GENERIC_INIT_TASK
+# Select if arch init_task initializer is different to init/init_task.c
+config ARCH_INIT_TASK
        bool
 
 config HAVE_REGS_AND_STACK_ACCESS_API
index 74d0004..991b8bb 100644 (file)
@@ -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 8b36535..cb253ce 100644 (file)
@@ -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 f4289ca..3dea723 100644 (file)
@@ -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 8570d6e..779b9c8 100644 (file)
@@ -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 4189fb5..1c3ccd4 100644 (file)
@@ -10,7 +10,6 @@ config TMS320C6X
        select HAVE_ARCH_TRACEHOOK
        select HAVE_DMA_API_DEBUG
        select HAVE_GENERIC_HARDIRQS
-       select HAVE_GENERIC_INIT_TASK
        select HAVE_MEMBLOCK
        select SPARSE_IRQ
        select IRQ_DOMAIN
index 15e30a7..2995035 100644 (file)
@@ -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 ed6dbd2..a685910 100644 (file)
@@ -9,7 +9,6 @@ config FRV
        select GENERIC_IRQ_SHOW
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_CPU_DEVICES
-       select HAVE_GENERIC_INIT_TASK
 
 config ZONE_DMA
        bool
index 5fac425..56e890d 100644 (file)
@@ -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 6ee5488..d2e4a33 100644 (file)
@@ -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 1197547..022ea3a 100644 (file)
@@ -34,6 +34,7 @@ config IA64
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_IOMAP
        select GENERIC_SMP_IDLE_THREAD
+       select ARCH_INIT_TASK
        default y
        help
          The Itanium Processor Family is Intel's 64-bit successor to
index 8b8bd7f..ef80a65 100644 (file)
@@ -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 1891127..d318c60 100644 (file)
@@ -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 21ccba6..ac22dc7 100644 (file)
@@ -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 d6c7890..186fc8c 100644 (file)
@@ -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 d28b6eb..3aa3de0 100644 (file)
@@ -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 6d92193..a478719 100644 (file)
@@ -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 4c6ca0d..ddb8b24 100644 (file)
@@ -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 946e881..c815535 100644 (file)
@@ -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 6c0eb21..15cab3e 100644 (file)
@@ -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 c760bcc..4b28577 100644 (file)
@@ -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 a0cd70b..244cfd0 100644 (file)
@@ -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 99aad7c..e417f35 100644 (file)
@@ -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 4fa3ff5..96033e2 100644 (file)
@@ -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 f03473c..20a49ba 100644 (file)
@@ -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 e24ca39..eeb8054 100644 (file)
@@ -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 2246959..046bf4b 100644 (file)
@@ -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 d0ab5bb..8a3f835 100644 (file)
@@ -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 c55eac9..7bc47ee 100644 (file)
@@ -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