diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2012-05-03 05:03:02 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-05 07:00:46 -0400 |
commit | a6359d1eec43d1fd6ffbac958149844873e0084f (patch) | |
tree | cbb9681ac4f34c6653064ecbd1bdda8f910d40a2 | |
parent | e4d59621923ba6c42f30a9d74c7c78d101c2f7aa (diff) |
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
-rw-r--r-- | arch/Kconfig | 3 | ||||
-rw-r--r-- | arch/alpha/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/Kconfig | 1 | ||||
-rw-r--r-- | arch/avr32/Kconfig | 1 | ||||
-rw-r--r-- | arch/blackfin/Kconfig | 1 | ||||
-rw-r--r-- | arch/c6x/Kconfig | 1 | ||||
-rw-r--r-- | arch/cris/Kconfig | 1 | ||||
-rw-r--r-- | arch/frv/Kconfig | 1 | ||||
-rw-r--r-- | arch/h8300/Kconfig | 1 | ||||
-rw-r--r-- | arch/hexagon/Kconfig | 1 | ||||
-rw-r--r-- | arch/ia64/Kconfig | 1 | ||||
-rw-r--r-- | arch/m32r/Kconfig | 1 | ||||
-rw-r--r-- | arch/m68k/Kconfig | 1 | ||||
-rw-r--r-- | arch/microblaze/Kconfig | 1 | ||||
-rw-r--r-- | arch/mips/Kconfig | 1 | ||||
-rw-r--r-- | arch/mn10300/Kconfig | 1 | ||||
-rw-r--r-- | arch/openrisc/Kconfig | 1 | ||||
-rw-r--r-- | arch/parisc/Kconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/Kconfig | 1 | ||||
-rw-r--r-- | arch/s390/Kconfig | 1 | ||||
-rw-r--r-- | arch/score/Kconfig | 1 | ||||
-rw-r--r-- | arch/sh/Kconfig | 1 | ||||
-rw-r--r-- | arch/sparc/Kconfig | 1 | ||||
-rw-r--r-- | arch/tile/Kconfig | 1 | ||||
-rw-r--r-- | arch/um/Kconfig.common | 1 | ||||
-rw-r--r-- | arch/unicore32/Kconfig | 1 | ||||
-rw-r--r-- | arch/x86/Kconfig | 1 | ||||
-rw-r--r-- | arch/xtensa/Kconfig | 1 | ||||
-rw-r--r-- | init/Makefile | 5 |
29 files changed, 7 insertions, 28 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 2dd8fdd7ea9f..597b132b3902 100644 --- a/arch/Kconfig +++ b/arch/Kconfig | |||
@@ -148,7 +148,8 @@ config USE_GENERIC_SMP_HELPERS | |||
148 | config GENERIC_SMP_IDLE_THREAD | 148 | config GENERIC_SMP_IDLE_THREAD |
149 | bool | 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 | bool | 153 | bool |
153 | 154 | ||
154 | config HAVE_REGS_AND_STACK_ACCESS_API | 155 | config HAVE_REGS_AND_STACK_ACCESS_API |
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 74d000480b69..991b8bbff4ff 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig | |||
@@ -16,7 +16,6 @@ config ALPHA | |||
16 | select ARCH_WANT_OPTIONAL_GPIOLIB | 16 | select ARCH_WANT_OPTIONAL_GPIOLIB |
17 | select ARCH_HAVE_NMI_SAFE_CMPXCHG | 17 | select ARCH_HAVE_NMI_SAFE_CMPXCHG |
18 | select GENERIC_SMP_IDLE_THREAD | 18 | select GENERIC_SMP_IDLE_THREAD |
19 | select HAVE_GENERIC_INIT_TASK | ||
20 | help | 19 | help |
21 | The Alpha is a 64-bit general-purpose processor designed and | 20 | The Alpha is a 64-bit general-purpose processor designed and |
22 | marketed by the Digital Equipment Corporation of blessed memory, | 21 | marketed by the Digital Equipment Corporation of blessed memory, |
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 8b365353a10d..cb253ce218a0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -35,7 +35,6 @@ config ARM | |||
35 | select GENERIC_PCI_IOMAP | 35 | select GENERIC_PCI_IOMAP |
36 | select HAVE_BPF_JIT if NET | 36 | select HAVE_BPF_JIT if NET |
37 | select GENERIC_SMP_IDLE_THREAD | 37 | select GENERIC_SMP_IDLE_THREAD |
38 | select HAVE_GENERIC_INIT_TASK | ||
39 | help | 38 | help |
40 | The ARM series is a line of low-power-consumption RISC chip designs | 39 | The ARM series is a line of low-power-consumption RISC chip designs |
41 | licensed by ARM Ltd and targeted at embedded applications and | 40 | licensed by ARM Ltd and targeted at embedded applications and |
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index f4289ca78b55..3dea7231f637 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig | |||
@@ -12,7 +12,6 @@ config AVR32 | |||
12 | select HARDIRQS_SW_RESEND | 12 | select HARDIRQS_SW_RESEND |
13 | select GENERIC_IRQ_SHOW | 13 | select GENERIC_IRQ_SHOW |
14 | select ARCH_HAVE_NMI_SAFE_CMPXCHG | 14 | select ARCH_HAVE_NMI_SAFE_CMPXCHG |
15 | select HAVE_GENERIC_INIT_TASK | ||
16 | help | 15 | help |
17 | AVR32 is a high-performance 32-bit RISC microprocessor core, | 16 | AVR32 is a high-performance 32-bit RISC microprocessor core, |
18 | designed for cost-sensitive embedded applications, with particular | 17 | designed for cost-sensitive embedded applications, with particular |
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 8570d6e21807..779b9c846fd7 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
@@ -38,7 +38,6 @@ config BLACKFIN | |||
38 | select IRQ_PER_CPU if SMP | 38 | select IRQ_PER_CPU if SMP |
39 | select HAVE_NMI_WATCHDOG if NMI_WATCHDOG | 39 | select HAVE_NMI_WATCHDOG if NMI_WATCHDOG |
40 | select GENERIC_SMP_IDLE_THREAD | 40 | select GENERIC_SMP_IDLE_THREAD |
41 | select HAVE_GENERIC_INIT_TASK | ||
42 | 41 | ||
43 | config GENERIC_CSUM | 42 | config GENERIC_CSUM |
44 | def_bool y | 43 | def_bool y |
diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig index 4189fb52d519..1c3ccd416d50 100644 --- a/arch/c6x/Kconfig +++ b/arch/c6x/Kconfig | |||
@@ -10,7 +10,6 @@ config TMS320C6X | |||
10 | select HAVE_ARCH_TRACEHOOK | 10 | select HAVE_ARCH_TRACEHOOK |
11 | select HAVE_DMA_API_DEBUG | 11 | select HAVE_DMA_API_DEBUG |
12 | select HAVE_GENERIC_HARDIRQS | 12 | select HAVE_GENERIC_HARDIRQS |
13 | select HAVE_GENERIC_INIT_TASK | ||
14 | select HAVE_MEMBLOCK | 13 | select HAVE_MEMBLOCK |
15 | select SPARSE_IRQ | 14 | select SPARSE_IRQ |
16 | select IRQ_DOMAIN | 15 | select IRQ_DOMAIN |
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 15e30a771a72..2995035812ec 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig | |||
@@ -50,7 +50,6 @@ config CRIS | |||
50 | select GENERIC_IRQ_SHOW | 50 | select GENERIC_IRQ_SHOW |
51 | select GENERIC_IOMAP | 51 | select GENERIC_IOMAP |
52 | select GENERIC_SMP_IDLE_THREAD if ETRAX_ARCH_V32 | 52 | select GENERIC_SMP_IDLE_THREAD if ETRAX_ARCH_V32 |
53 | select HAVE_GENERIC_INIT_TASK | ||
54 | 53 | ||
55 | config HZ | 54 | config HZ |
56 | int | 55 | int |
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig index ed6dbd290c42..a685910d2d5c 100644 --- a/arch/frv/Kconfig +++ b/arch/frv/Kconfig | |||
@@ -9,7 +9,6 @@ config FRV | |||
9 | select GENERIC_IRQ_SHOW | 9 | select GENERIC_IRQ_SHOW |
10 | select ARCH_HAVE_NMI_SAFE_CMPXCHG | 10 | select ARCH_HAVE_NMI_SAFE_CMPXCHG |
11 | select GENERIC_CPU_DEVICES | 11 | select GENERIC_CPU_DEVICES |
12 | select HAVE_GENERIC_INIT_TASK | ||
13 | 12 | ||
14 | config ZONE_DMA | 13 | config ZONE_DMA |
15 | bool | 14 | bool |
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig index 5fac425aece4..56e890df5053 100644 --- a/arch/h8300/Kconfig +++ b/arch/h8300/Kconfig | |||
@@ -5,7 +5,6 @@ config H8300 | |||
5 | select HAVE_GENERIC_HARDIRQS | 5 | select HAVE_GENERIC_HARDIRQS |
6 | select GENERIC_IRQ_SHOW | 6 | select GENERIC_IRQ_SHOW |
7 | select GENERIC_CPU_DEVICES | 7 | select GENERIC_CPU_DEVICES |
8 | select HAVE_GENERIC_INIT_TASK | ||
9 | 8 | ||
10 | config SYMBOL_PREFIX | 9 | config SYMBOL_PREFIX |
11 | string | 10 | string |
diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig index 6ee5488ed305..d2e4a3330336 100644 --- a/arch/hexagon/Kconfig +++ b/arch/hexagon/Kconfig | |||
@@ -28,7 +28,6 @@ config HEXAGON | |||
28 | select NO_IOPORT | 28 | select NO_IOPORT |
29 | select GENERIC_IOMAP | 29 | select GENERIC_IOMAP |
30 | select GENERIC_SMP_IDLE_THREAD | 30 | select GENERIC_SMP_IDLE_THREAD |
31 | select HAVE_GENERIC_INIT_TASK | ||
32 | # mostly generic routines, with some accelerated ones | 31 | # mostly generic routines, with some accelerated ones |
33 | ---help--- | 32 | ---help--- |
34 | Qualcomm Hexagon is a processor architecture designed for high | 33 | Qualcomm Hexagon is a processor architecture designed for high |
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 11975475516a..022ea3a9d1ab 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -34,6 +34,7 @@ config IA64 | |||
34 | select ARCH_HAVE_NMI_SAFE_CMPXCHG | 34 | select ARCH_HAVE_NMI_SAFE_CMPXCHG |
35 | select GENERIC_IOMAP | 35 | select GENERIC_IOMAP |
36 | select GENERIC_SMP_IDLE_THREAD | 36 | select GENERIC_SMP_IDLE_THREAD |
37 | select ARCH_INIT_TASK | ||
37 | default y | 38 | default y |
38 | help | 39 | help |
39 | The Itanium Processor Family is Intel's 64-bit successor to | 40 | The Itanium Processor Family is Intel's 64-bit successor to |
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index 8b8bd7fa148a..ef80a6546ff2 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig | |||
@@ -11,7 +11,6 @@ config M32R | |||
11 | select GENERIC_IRQ_PROBE | 11 | select GENERIC_IRQ_PROBE |
12 | select GENERIC_IRQ_SHOW | 12 | select GENERIC_IRQ_SHOW |
13 | select GENERIC_ATOMIC64 | 13 | select GENERIC_ATOMIC64 |
14 | select HAVE_GENERIC_INIT_TASK | ||
15 | 14 | ||
16 | config SBUS | 15 | config SBUS |
17 | bool | 16 | bool |
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 1891127c7db0..d318c606c888 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig | |||
@@ -8,7 +8,6 @@ config M68K | |||
8 | select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS | 8 | select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS |
9 | select GENERIC_CPU_DEVICES | 9 | select GENERIC_CPU_DEVICES |
10 | select FPU if MMU | 10 | select FPU if MMU |
11 | select HAVE_GENERIC_INIT_TASK | ||
12 | 11 | ||
13 | config RWSEM_GENERIC_SPINLOCK | 12 | config RWSEM_GENERIC_SPINLOCK |
14 | bool | 13 | bool |
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 21ccba6a05f9..ac22dc7f4cab 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig | |||
@@ -22,7 +22,6 @@ config MICROBLAZE | |||
22 | select GENERIC_PCI_IOMAP | 22 | select GENERIC_PCI_IOMAP |
23 | select GENERIC_CPU_DEVICES | 23 | select GENERIC_CPU_DEVICES |
24 | select GENERIC_ATOMIC64 | 24 | select GENERIC_ATOMIC64 |
25 | select HAVE_GENERIC_INIT_TASK | ||
26 | 25 | ||
27 | config SWAP | 26 | config SWAP |
28 | def_bool n | 27 | def_bool n |
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index d6c78901e5f2..186fc8cf9ee0 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -30,7 +30,6 @@ config MIPS | |||
30 | select HAVE_MEMBLOCK_NODE_MAP | 30 | select HAVE_MEMBLOCK_NODE_MAP |
31 | select ARCH_DISCARD_MEMBLOCK | 31 | select ARCH_DISCARD_MEMBLOCK |
32 | select GENERIC_SMP_IDLE_THREAD | 32 | select GENERIC_SMP_IDLE_THREAD |
33 | select HAVE_GENERIC_INIT_TASK | ||
34 | 33 | ||
35 | menu "Machine selection" | 34 | menu "Machine selection" |
36 | 35 | ||
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig index d28b6eb1b122..3aa3de017159 100644 --- a/arch/mn10300/Kconfig +++ b/arch/mn10300/Kconfig | |||
@@ -6,7 +6,6 @@ config MN10300 | |||
6 | select HAVE_ARCH_TRACEHOOK | 6 | select HAVE_ARCH_TRACEHOOK |
7 | select HAVE_ARCH_KGDB | 7 | select HAVE_ARCH_KGDB |
8 | select HAVE_NMI_WATCHDOG if MN10300_WD_TIMER | 8 | select HAVE_NMI_WATCHDOG if MN10300_WD_TIMER |
9 | select HAVE_GENERIC_INIT_TASK | ||
10 | 9 | ||
11 | config AM33_2 | 10 | config AM33_2 |
12 | def_bool n | 11 | def_bool n |
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig index 6d921936f4ab..a4787197d8fe 100644 --- a/arch/openrisc/Kconfig +++ b/arch/openrisc/Kconfig | |||
@@ -17,7 +17,6 @@ config OPENRISC | |||
17 | select GENERIC_IOMAP | 17 | select GENERIC_IOMAP |
18 | select GENERIC_CPU_DEVICES | 18 | select GENERIC_CPU_DEVICES |
19 | select GENERIC_ATOMIC64 | 19 | select GENERIC_ATOMIC64 |
20 | select HAVE_GENERIC_INIT_TASK | ||
21 | 20 | ||
22 | config MMU | 21 | config MMU |
23 | def_bool y | 22 | def_bool y |
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index 4c6ca0de90cc..ddb8b24b823d 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig | |||
@@ -18,7 +18,6 @@ config PARISC | |||
18 | select IRQ_PER_CPU | 18 | select IRQ_PER_CPU |
19 | select ARCH_HAVE_NMI_SAFE_CMPXCHG | 19 | select ARCH_HAVE_NMI_SAFE_CMPXCHG |
20 | select GENERIC_SMP_IDLE_THREAD | 20 | select GENERIC_SMP_IDLE_THREAD |
21 | select HAVE_GENERIC_INIT_TASK | ||
22 | 21 | ||
23 | help | 22 | help |
24 | The PA-RISC microprocessor is designed by Hewlett-Packard and used | 23 | The PA-RISC microprocessor is designed by Hewlett-Packard and used |
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 946e8816ecd3..c81553508366 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -145,7 +145,6 @@ config PPC | |||
145 | select HAVE_ARCH_JUMP_LABEL | 145 | select HAVE_ARCH_JUMP_LABEL |
146 | select ARCH_HAVE_NMI_SAFE_CMPXCHG | 146 | select ARCH_HAVE_NMI_SAFE_CMPXCHG |
147 | select GENERIC_SMP_IDLE_THREAD | 147 | select GENERIC_SMP_IDLE_THREAD |
148 | select HAVE_GENERIC_INIT_TASK | ||
149 | 148 | ||
150 | config EARLY_PRINTK | 149 | config EARLY_PRINTK |
151 | bool | 150 | bool |
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 6c0eb214ab27..15cab3ee44e8 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
@@ -123,7 +123,6 @@ config S390 | |||
123 | select ARCH_INLINE_WRITE_UNLOCK_IRQ | 123 | select ARCH_INLINE_WRITE_UNLOCK_IRQ |
124 | select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE | 124 | select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE |
125 | select GENERIC_SMP_IDLE_THREAD | 125 | select GENERIC_SMP_IDLE_THREAD |
126 | select HAVE_GENERIC_INIT_TASK | ||
127 | 126 | ||
128 | config SCHED_OMIT_FRAME_POINTER | 127 | config SCHED_OMIT_FRAME_POINTER |
129 | def_bool y | 128 | def_bool y |
diff --git a/arch/score/Kconfig b/arch/score/Kconfig index c760bccfad40..4b285779ac05 100644 --- a/arch/score/Kconfig +++ b/arch/score/Kconfig | |||
@@ -9,7 +9,6 @@ config SCORE | |||
9 | select HAVE_MEMBLOCK_NODE_MAP | 9 | select HAVE_MEMBLOCK_NODE_MAP |
10 | select ARCH_DISCARD_MEMBLOCK | 10 | select ARCH_DISCARD_MEMBLOCK |
11 | select GENERIC_CPU_DEVICES | 11 | select GENERIC_CPU_DEVICES |
12 | select HAVE_GENERIC_INIT_TASK | ||
13 | 12 | ||
14 | choice | 13 | choice |
15 | prompt "System type" | 14 | prompt "System type" |
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index a0cd70be8656..244cfd0dbb7b 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -29,7 +29,6 @@ config SUPERH | |||
29 | select GENERIC_ATOMIC64 | 29 | select GENERIC_ATOMIC64 |
30 | select GENERIC_IRQ_SHOW | 30 | select GENERIC_IRQ_SHOW |
31 | select GENERIC_SMP_IDLE_THREAD | 31 | select GENERIC_SMP_IDLE_THREAD |
32 | select HAVE_GENERIC_INIT_TASK | ||
33 | help | 32 | help |
34 | The SuperH is a RISC processor targeted for use in embedded systems | 33 | The SuperH is a RISC processor targeted for use in embedded systems |
35 | and consumer electronics; it was also used in the Sega Dreamcast | 34 | and consumer electronics; it was also used in the Sega Dreamcast |
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 99aad7cd0075..e417f35d5912 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
@@ -31,7 +31,6 @@ config SPARC | |||
31 | select GENERIC_PCI_IOMAP | 31 | select GENERIC_PCI_IOMAP |
32 | select HAVE_NMI_WATCHDOG if SPARC64 | 32 | select HAVE_NMI_WATCHDOG if SPARC64 |
33 | select GENERIC_SMP_IDLE_THREAD | 33 | select GENERIC_SMP_IDLE_THREAD |
34 | select HAVE_GENERIC_INIT_TASK | ||
35 | 34 | ||
36 | config SPARC32 | 35 | config SPARC32 |
37 | def_bool !64BIT | 36 | def_bool !64BIT |
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig index 4fa3ff5a7bc3..96033e2d6845 100644 --- a/arch/tile/Kconfig +++ b/arch/tile/Kconfig | |||
@@ -13,7 +13,6 @@ config TILE | |||
13 | select GENERIC_IRQ_SHOW | 13 | select GENERIC_IRQ_SHOW |
14 | select SYS_HYPERVISOR | 14 | select SYS_HYPERVISOR |
15 | select ARCH_HAVE_NMI_SAFE_CMPXCHG | 15 | select ARCH_HAVE_NMI_SAFE_CMPXCHG |
16 | select HAVE_GENERIC_INIT_TASK | ||
17 | 16 | ||
18 | # FIXME: investigate whether we need/want these options. | 17 | # FIXME: investigate whether we need/want these options. |
19 | # select HAVE_IOREMAP_PROT | 18 | # select HAVE_IOREMAP_PROT |
diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common index f03473cf86df..20a49ba93cb9 100644 --- a/arch/um/Kconfig.common +++ b/arch/um/Kconfig.common | |||
@@ -10,7 +10,6 @@ config UML | |||
10 | select GENERIC_IRQ_SHOW | 10 | select GENERIC_IRQ_SHOW |
11 | select GENERIC_CPU_DEVICES | 11 | select GENERIC_CPU_DEVICES |
12 | select GENERIC_IO | 12 | select GENERIC_IO |
13 | select HAVE_GENERIC_INIT_TASK | ||
14 | 13 | ||
15 | config MMU | 14 | config MMU |
16 | bool | 15 | bool |
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig index e24ca398120e..eeb8054c7cd8 100644 --- a/arch/unicore32/Kconfig +++ b/arch/unicore32/Kconfig | |||
@@ -13,7 +13,6 @@ config UNICORE32 | |||
13 | select GENERIC_IRQ_SHOW | 13 | select GENERIC_IRQ_SHOW |
14 | select ARCH_WANT_FRAME_POINTERS | 14 | select ARCH_WANT_FRAME_POINTERS |
15 | select GENERIC_IOMAP | 15 | select GENERIC_IOMAP |
16 | select HAVE_GENERIC_INIT_TASK | ||
17 | help | 16 | help |
18 | UniCore-32 is 32-bit Instruction Set Architecture, | 17 | UniCore-32 is 32-bit Instruction Set Architecture, |
19 | including a series of low-power-consumption RISC chip | 18 | including a series of low-power-consumption RISC chip |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 224695938400..046bf4bd2510 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -83,7 +83,6 @@ config X86 | |||
83 | select GENERIC_IOMAP | 83 | select GENERIC_IOMAP |
84 | select DCACHE_WORD_ACCESS if !DEBUG_PAGEALLOC | 84 | select DCACHE_WORD_ACCESS if !DEBUG_PAGEALLOC |
85 | select GENERIC_SMP_IDLE_THREAD | 85 | select GENERIC_SMP_IDLE_THREAD |
86 | select HAVE_GENERIC_INIT_TASK | ||
87 | 86 | ||
88 | config INSTRUCTION_DECODER | 87 | config INSTRUCTION_DECODER |
89 | def_bool (KPROBES || PERF_EVENTS) | 88 | def_bool (KPROBES || PERF_EVENTS) |
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index d0ab5bb0d582..8a3f8351f438 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig | |||
@@ -10,7 +10,6 @@ config XTENSA | |||
10 | select HAVE_GENERIC_HARDIRQS | 10 | select HAVE_GENERIC_HARDIRQS |
11 | select GENERIC_IRQ_SHOW | 11 | select GENERIC_IRQ_SHOW |
12 | select GENERIC_CPU_DEVICES | 12 | select GENERIC_CPU_DEVICES |
13 | select HAVE_GENERIC_INIT_TASK | ||
14 | help | 13 | help |
15 | Xtensa processors are 32-bit RISC machines designed by Tensilica | 14 | Xtensa processors are 32-bit RISC machines designed by Tensilica |
16 | primarily for embedded systems. These processors are both | 15 | primarily for embedded systems. These processors are both |
diff --git a/init/Makefile b/init/Makefile index c55eac955cdc..7bc47ee31c36 100644 --- a/init/Makefile +++ b/init/Makefile | |||
@@ -9,7 +9,10 @@ else | |||
9 | obj-$(CONFIG_BLK_DEV_INITRD) += initramfs.o | 9 | obj-$(CONFIG_BLK_DEV_INITRD) += initramfs.o |
10 | endif | 10 | endif |
11 | obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o | 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 | mounts-y := do_mounts.o | 17 | mounts-y := do_mounts.o |
15 | mounts-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o | 18 | mounts-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o |