tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

init_task: Replace CONFIG_HAVE_GENERIC_INIT_TASK

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

Thomas Gleixner a6359d1e e4d59621

+7 -28
+2 -1
arch/Kconfig
··· 148 148 config GENERIC_SMP_IDLE_THREAD 149 149 bool 150 150 151 - config HAVE_GENERIC_INIT_TASK 151 + # Select if arch init_task initializer is different to init/init_task.c 152 + config ARCH_INIT_TASK 152 153 bool 153 154 154 155 config HAVE_REGS_AND_STACK_ACCESS_API
-1
arch/alpha/Kconfig
··· 16 16 select ARCH_WANT_OPTIONAL_GPIOLIB 17 17 select ARCH_HAVE_NMI_SAFE_CMPXCHG 18 18 select GENERIC_SMP_IDLE_THREAD 19 - select HAVE_GENERIC_INIT_TASK 20 19 help 21 20 The Alpha is a 64-bit general-purpose processor designed and 22 21 marketed by the Digital Equipment Corporation of blessed memory,
-1
arch/arm/Kconfig
··· 35 35 select GENERIC_PCI_IOMAP 36 36 select HAVE_BPF_JIT if NET 37 37 select GENERIC_SMP_IDLE_THREAD 38 - select HAVE_GENERIC_INIT_TASK 39 38 help 40 39 The ARM series is a line of low-power-consumption RISC chip designs 41 40 licensed by ARM Ltd and targeted at embedded applications and
-1
arch/avr32/Kconfig
··· 12 12 select HARDIRQS_SW_RESEND 13 13 select GENERIC_IRQ_SHOW 14 14 select ARCH_HAVE_NMI_SAFE_CMPXCHG 15 - select HAVE_GENERIC_INIT_TASK 16 15 help 17 16 AVR32 is a high-performance 32-bit RISC microprocessor core, 18 17 designed for cost-sensitive embedded applications, with particular
-1
arch/blackfin/Kconfig
··· 38 38 select IRQ_PER_CPU if SMP 39 39 select HAVE_NMI_WATCHDOG if NMI_WATCHDOG 40 40 select GENERIC_SMP_IDLE_THREAD 41 - select HAVE_GENERIC_INIT_TASK 42 41 43 42 config GENERIC_CSUM 44 43 def_bool y
-1
arch/c6x/Kconfig
··· 10 10 select HAVE_ARCH_TRACEHOOK 11 11 select HAVE_DMA_API_DEBUG 12 12 select HAVE_GENERIC_HARDIRQS 13 - select HAVE_GENERIC_INIT_TASK 14 13 select HAVE_MEMBLOCK 15 14 select SPARSE_IRQ 16 15 select IRQ_DOMAIN
-1
arch/cris/Kconfig
··· 50 50 select GENERIC_IRQ_SHOW 51 51 select GENERIC_IOMAP 52 52 select GENERIC_SMP_IDLE_THREAD if ETRAX_ARCH_V32 53 - select HAVE_GENERIC_INIT_TASK 54 53 55 54 config HZ 56 55 int
-1
arch/frv/Kconfig
··· 9 9 select GENERIC_IRQ_SHOW 10 10 select ARCH_HAVE_NMI_SAFE_CMPXCHG 11 11 select GENERIC_CPU_DEVICES 12 - select HAVE_GENERIC_INIT_TASK 13 12 14 13 config ZONE_DMA 15 14 bool
-1
arch/h8300/Kconfig
··· 5 5 select HAVE_GENERIC_HARDIRQS 6 6 select GENERIC_IRQ_SHOW 7 7 select GENERIC_CPU_DEVICES 8 - select HAVE_GENERIC_INIT_TASK 9 8 10 9 config SYMBOL_PREFIX 11 10 string
-1
arch/hexagon/Kconfig
··· 28 28 select NO_IOPORT 29 29 select GENERIC_IOMAP 30 30 select GENERIC_SMP_IDLE_THREAD 31 - select HAVE_GENERIC_INIT_TASK 32 31 # mostly generic routines, with some accelerated ones 33 32 ---help--- 34 33 Qualcomm Hexagon is a processor architecture designed for high
+1
arch/ia64/Kconfig
··· 34 34 select ARCH_HAVE_NMI_SAFE_CMPXCHG 35 35 select GENERIC_IOMAP 36 36 select GENERIC_SMP_IDLE_THREAD 37 + select ARCH_INIT_TASK 37 38 default y 38 39 help 39 40 The Itanium Processor Family is Intel's 64-bit successor to
-1
arch/m32r/Kconfig
··· 11 11 select GENERIC_IRQ_PROBE 12 12 select GENERIC_IRQ_SHOW 13 13 select GENERIC_ATOMIC64 14 - select HAVE_GENERIC_INIT_TASK 15 14 16 15 config SBUS 17 16 bool
-1
arch/m68k/Kconfig
··· 8 8 select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS 9 9 select GENERIC_CPU_DEVICES 10 10 select FPU if MMU 11 - select HAVE_GENERIC_INIT_TASK 12 11 13 12 config RWSEM_GENERIC_SPINLOCK 14 13 bool
-1
arch/microblaze/Kconfig
··· 22 22 select GENERIC_PCI_IOMAP 23 23 select GENERIC_CPU_DEVICES 24 24 select GENERIC_ATOMIC64 25 - select HAVE_GENERIC_INIT_TASK 26 25 27 26 config SWAP 28 27 def_bool n
-1
arch/mips/Kconfig
··· 30 30 select HAVE_MEMBLOCK_NODE_MAP 31 31 select ARCH_DISCARD_MEMBLOCK 32 32 select GENERIC_SMP_IDLE_THREAD 33 - select HAVE_GENERIC_INIT_TASK 34 33 35 34 menu "Machine selection" 36 35
-1
arch/mn10300/Kconfig
··· 6 6 select HAVE_ARCH_TRACEHOOK 7 7 select HAVE_ARCH_KGDB 8 8 select HAVE_NMI_WATCHDOG if MN10300_WD_TIMER 9 - select HAVE_GENERIC_INIT_TASK 10 9 11 10 config AM33_2 12 11 def_bool n
-1
arch/openrisc/Kconfig
··· 17 17 select GENERIC_IOMAP 18 18 select GENERIC_CPU_DEVICES 19 19 select GENERIC_ATOMIC64 20 - select HAVE_GENERIC_INIT_TASK 21 20 22 21 config MMU 23 22 def_bool y
-1
arch/parisc/Kconfig
··· 18 18 select IRQ_PER_CPU 19 19 select ARCH_HAVE_NMI_SAFE_CMPXCHG 20 20 select GENERIC_SMP_IDLE_THREAD 21 - select HAVE_GENERIC_INIT_TASK 22 21 23 22 help 24 23 The PA-RISC microprocessor is designed by Hewlett-Packard and used
-1
arch/powerpc/Kconfig
··· 145 145 select HAVE_ARCH_JUMP_LABEL 146 146 select ARCH_HAVE_NMI_SAFE_CMPXCHG 147 147 select GENERIC_SMP_IDLE_THREAD 148 - select HAVE_GENERIC_INIT_TASK 149 148 150 149 config EARLY_PRINTK 151 150 bool
-1
arch/s390/Kconfig
··· 123 123 select ARCH_INLINE_WRITE_UNLOCK_IRQ 124 124 select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE 125 125 select GENERIC_SMP_IDLE_THREAD 126 - select HAVE_GENERIC_INIT_TASK 127 126 128 127 config SCHED_OMIT_FRAME_POINTER 129 128 def_bool y
-1
arch/score/Kconfig
··· 9 9 select HAVE_MEMBLOCK_NODE_MAP 10 10 select ARCH_DISCARD_MEMBLOCK 11 11 select GENERIC_CPU_DEVICES 12 - select HAVE_GENERIC_INIT_TASK 13 12 14 13 choice 15 14 prompt "System type"
-1
arch/sh/Kconfig
··· 29 29 select GENERIC_ATOMIC64 30 30 select GENERIC_IRQ_SHOW 31 31 select GENERIC_SMP_IDLE_THREAD 32 - select HAVE_GENERIC_INIT_TASK 33 32 help 34 33 The SuperH is a RISC processor targeted for use in embedded systems 35 34 and consumer electronics; it was also used in the Sega Dreamcast
-1
arch/sparc/Kconfig
··· 31 31 select GENERIC_PCI_IOMAP 32 32 select HAVE_NMI_WATCHDOG if SPARC64 33 33 select GENERIC_SMP_IDLE_THREAD 34 - select HAVE_GENERIC_INIT_TASK 35 34 36 35 config SPARC32 37 36 def_bool !64BIT
-1
arch/tile/Kconfig
··· 13 13 select GENERIC_IRQ_SHOW 14 14 select SYS_HYPERVISOR 15 15 select ARCH_HAVE_NMI_SAFE_CMPXCHG 16 - select HAVE_GENERIC_INIT_TASK 17 16 18 17 # FIXME: investigate whether we need/want these options. 19 18 # select HAVE_IOREMAP_PROT
-1
arch/um/Kconfig.common
··· 10 10 select GENERIC_IRQ_SHOW 11 11 select GENERIC_CPU_DEVICES 12 12 select GENERIC_IO 13 - select HAVE_GENERIC_INIT_TASK 14 13 15 14 config MMU 16 15 bool
-1
arch/unicore32/Kconfig
··· 13 13 select GENERIC_IRQ_SHOW 14 14 select ARCH_WANT_FRAME_POINTERS 15 15 select GENERIC_IOMAP 16 - select HAVE_GENERIC_INIT_TASK 17 16 help 18 17 UniCore-32 is 32-bit Instruction Set Architecture, 19 18 including a series of low-power-consumption RISC chip
-1
arch/x86/Kconfig
··· 83 83 select GENERIC_IOMAP 84 84 select DCACHE_WORD_ACCESS if !DEBUG_PAGEALLOC 85 85 select GENERIC_SMP_IDLE_THREAD 86 - select HAVE_GENERIC_INIT_TASK 87 86 88 87 config INSTRUCTION_DECODER 89 88 def_bool (KPROBES || PERF_EVENTS)
-1
arch/xtensa/Kconfig
··· 10 10 select HAVE_GENERIC_HARDIRQS 11 11 select GENERIC_IRQ_SHOW 12 12 select GENERIC_CPU_DEVICES 13 - select HAVE_GENERIC_INIT_TASK 14 13 help 15 14 Xtensa processors are 32-bit RISC machines designed by Tensilica 16 15 primarily for embedded systems. These processors are both
+4 -1
init/Makefile
··· 9 9 obj-$(CONFIG_BLK_DEV_INITRD) += initramfs.o 10 10 endif 11 11 obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o 12 - obj-$(CONFIG_HAVE_GENERIC_INIT_TASK) += init_task.o 12 + 13 + ifneq ($(CONFIG_ARCH_INIT_TASK),y) 14 + obj-y += init_task.o 15 + endif 13 16 14 17 mounts-y := do_mounts.o 15 18 mounts-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o