init_task: Replace CONFIG_HAVE_GENERIC_INIT_TASK
authorThomas Gleixner <tglx@linutronix.de>
Thu, 3 May 2012 09:03:02 +0000 (09:03 +0000)
committerThomas Gleixner <tglx@linutronix.de>
Sat, 5 May 2012 11:00:46 +0000 (13:00 +0200)
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 2dd8fdd7ea9f231318d38d1010cfd6ffc4d78f65..597b132b3902b297074832e74df7a1a65ec4f03c 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 74d000480b69a5d1ee525cd34b68f31bf1d6e1bf..991b8bbff4ffc21f93009a4e627f3d9e6c418bd5 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 8b365353a10d379df848baa2dc106f6797ce34e2..cb253ce218a0cd42569148f19208c393e29cab6d 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 f4289ca78b55941e808ccb7dfa012b8bac3e786c..3dea7231f637c5d09e8c545fdee437a550b67c10 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 8570d6e218070c7b8f25d97f7ccd232c2c60a562..779b9c846fd7fef590b2d374ceb47339aeaf558e 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 4189fb52d5193340c7ac8521c08d00a7a2f049e2..1c3ccd416d50ad374d05331ea547f6835fcbab10 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 15e30a771a7278683ecf504896f6a05c636696d2..2995035812eccaf8b80f3d889470626dee7f36e2 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 ed6dbd290c42871fab35ed98cdff3a8d334ffe70..a685910d2d5ce562f36f8f4ae02811390600682c 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 5fac425aece4349816413ff32c11ef52742e7144..56e890df5053605a8eb7a66514eb096d0e110b2d 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 6ee5488ed305669553c6eeca302edc9758169e88..d2e4a333033626d8ca1fb9ebf09851dfe54278cd 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 11975475516a6e3caaf7fd8dd2ee674300f43b39..022ea3a9d1ab2474d9723823351988c369c8f60c 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 8b8bd7fa148a92e1711f03230d431d0f033cadf3..ef80a6546ff2d37804f58298c185b5baf3dd6595 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 1891127c7db0c741a1893631354edf9be9c3267a..d318c606c8883d20c8b7e3230d71852091d8a3c6 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 21ccba6a05f9c1f34574ab066752f2525e10274b..ac22dc7f4cab0ffa882182103fe6c0ccf1ad6963 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 d6c78901e5f27785e27b379b39d0503b7b07c68a..186fc8cf9ee0b37c4ef7def5d423cb67e8f6db77 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 d28b6eb1b122f569afa3f069e4ed2c664094c1d9..3aa3de017159165c322d7e1e05542228ff06b462 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 6d921936f4abecd294bce73975daa04e25186fc7..a4787197d8fe3ea39b28c646ecfed383263ea0f1 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 4c6ca0de90cce7fa03469543f368987c538e56f0..ddb8b24b823d1c77881f80cc019570c537ea6c62 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 946e8816ecd3da25fa498ef56290c2aa4cbc46fa..c815535083664096fb475c0fdff596c42fe36784 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 6c0eb214ab27323664f3749150b2ffdbf53adcf9..15cab3ee44e86c58a1d3e10163798ed92c971d08 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 c760bccfad405754c7d516bb33c936a3b35ee6ec..4b285779ac05e34559134072e6de57845abbe2ad 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 a0cd70be86568e45b497227738f24ced93359712..244cfd0dbb7b685b63f821e8acaa528c0e7af60d 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 99aad7cd0075812aaa54843c6108feb09d882a59..e417f35d5912da4f645ef9b3dfe9974153e746c3 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 4fa3ff5a7bc3f2e17b3235c5052c2aebfdac0503..96033e2d6845cc84a442541fb73f095f8d272f91 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 f03473cf86df0bf28cda627e2a5d450bafcb13db..20a49ba93cb9d537d3f0149fc2e60cb770c2c43d 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 e24ca398120ef179982e80cc463b3dba413179fc..eeb8054c7cd84347d242bba052c44cd64a5da5af 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 224695938400f042ae379d07f7c9a3e56ca70153..046bf4bd2510dfbaaea50c0fd3c7641ae4340cbf 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 d0ab5bb0d582cac204b1545c7d522ee17a921fe6..8a3f8351f4380d5ff8da08978ceb83fd4d19d689 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 c55eac955cdcd08f95407f59aa7d0e80635eada2..7bc47ee31c369d442676edba32233fbb2ddbb462 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