aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2013-04-17 04:33:13 -0400
committerThomas Gleixner <tglx@linutronix.de>2013-04-17 04:39:38 -0400
commitd190e8195b90bc1e65c494fe08e54e9e581bfd16 (patch)
treec605d086deeec31a94fb982779b54c15c2be876f
parent8198c1696a2cd15d436ade172bfd8085f5f818d3 (diff)
idle: Remove GENERIC_IDLE_LOOP config switch
All archs are converted over. Remove the config switch and the fallback code. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/Kconfig3
-rw-r--r--arch/alpha/Kconfig1
-rw-r--r--arch/arc/Kconfig1
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--arch/arm64/Kconfig1
-rw-r--r--arch/avr32/Kconfig1
-rw-r--r--arch/blackfin/Kconfig1
-rw-r--r--arch/c6x/Kconfig1
-rw-r--r--arch/cris/Kconfig1
-rw-r--r--arch/frv/Kconfig1
-rw-r--r--arch/h8300/Kconfig1
-rw-r--r--arch/hexagon/Kconfig1
-rw-r--r--arch/ia64/Kconfig1
-rw-r--r--arch/m32r/Kconfig1
-rw-r--r--arch/m68k/Kconfig1
-rw-r--r--arch/metag/Kconfig1
-rw-r--r--arch/microblaze/Kconfig1
-rw-r--r--arch/mips/Kconfig1
-rw-r--r--arch/mn10300/Kconfig1
-rw-r--r--arch/openrisc/Kconfig1
-rw-r--r--arch/parisc/Kconfig1
-rw-r--r--arch/powerpc/Kconfig1
-rw-r--r--arch/s390/Kconfig1
-rw-r--r--arch/score/Kconfig1
-rw-r--r--arch/sh/Kconfig1
-rw-r--r--arch/sparc/Kconfig1
-rw-r--r--arch/tile/Kconfig1
-rw-r--r--arch/um/Kconfig.common1
-rw-r--r--arch/unicore32/Kconfig1
-rw-r--r--arch/x86/Kconfig1
-rw-r--r--arch/xtensa/Kconfig1
-rw-r--r--kernel/cpu/idle.c8
32 files changed, 0 insertions, 41 deletions
diff --git a/arch/Kconfig b/arch/Kconfig
index a699f3767be4..1455579791ec 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -216,9 +216,6 @@ config USE_GENERIC_SMP_HELPERS
216config GENERIC_SMP_IDLE_THREAD 216config GENERIC_SMP_IDLE_THREAD
217 bool 217 bool
218 218
219config GENERIC_IDLE_LOOP
220 bool
221
222# Select if arch init_task initializer is different to init/init_task.c 219# Select if arch init_task initializer is different to init/init_task.c
223config ARCH_INIT_TASK 220config ARCH_INIT_TASK
224 bool 221 bool
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 60469820a6c5..8a33ba01301f 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -17,7 +17,6 @@ config ALPHA
17 select ARCH_WANT_IPC_PARSE_VERSION 17 select ARCH_WANT_IPC_PARSE_VERSION
18 select ARCH_HAVE_NMI_SAFE_CMPXCHG 18 select ARCH_HAVE_NMI_SAFE_CMPXCHG
19 select GENERIC_SMP_IDLE_THREAD 19 select GENERIC_SMP_IDLE_THREAD
20 select GENERIC_IDLE_LOOP
21 select GENERIC_CMOS_UPDATE 20 select GENERIC_CMOS_UPDATE
22 select GENERIC_STRNCPY_FROM_USER 21 select GENERIC_STRNCPY_FROM_USER
23 select GENERIC_STRNLEN_USER 22 select GENERIC_STRNLEN_USER
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index b006977a1516..e6f4eca09ee3 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -14,7 +14,6 @@ config ARC
14 select GENERIC_ATOMIC64 14 select GENERIC_ATOMIC64
15 select GENERIC_CLOCKEVENTS 15 select GENERIC_CLOCKEVENTS
16 select GENERIC_FIND_FIRST_BIT 16 select GENERIC_FIND_FIRST_BIT
17 select GENERIC_IDLE_LOOP
18 # for now, we don't need GENERIC_IRQ_PROBE, CONFIG_GENERIC_IRQ_CHIP 17 # for now, we don't need GENERIC_IRQ_PROBE, CONFIG_GENERIC_IRQ_CHIP
19 select GENERIC_IRQ_SHOW 18 select GENERIC_IRQ_SHOW
20 select GENERIC_KERNEL_EXECVE 19 select GENERIC_KERNEL_EXECVE
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 128551fcc6dd..fcedd612c54c 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -15,7 +15,6 @@ config ARM
15 select GENERIC_IRQ_SHOW 15 select GENERIC_IRQ_SHOW
16 select GENERIC_PCI_IOMAP 16 select GENERIC_PCI_IOMAP
17 select GENERIC_SMP_IDLE_THREAD 17 select GENERIC_SMP_IDLE_THREAD
18 select GENERIC_IDLE_LOOP
19 select GENERIC_IDLE_POLL_SETUP 18 select GENERIC_IDLE_POLL_SETUP
20 select GENERIC_STRNCPY_FROM_USER 19 select GENERIC_STRNCPY_FROM_USER
21 select GENERIC_STRNLEN_USER 20 select GENERIC_STRNLEN_USER
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index ca2c871795c5..9b6d19f74078 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -9,7 +9,6 @@ config ARM64
9 select CLONE_BACKWARDS 9 select CLONE_BACKWARDS
10 select COMMON_CLK 10 select COMMON_CLK
11 select GENERIC_CLOCKEVENTS 11 select GENERIC_CLOCKEVENTS
12 select GENERIC_IDLE_LOOP
13 select GENERIC_IOMAP 12 select GENERIC_IOMAP
14 select GENERIC_IRQ_PROBE 13 select GENERIC_IRQ_PROBE
15 select GENERIC_IRQ_SHOW 14 select GENERIC_IRQ_SHOW
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index bbecda4c3373..c1a868d398bd 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -10,7 +10,6 @@ config AVR32
10 select VIRT_TO_BUS 10 select VIRT_TO_BUS
11 select GENERIC_IRQ_PROBE 11 select GENERIC_IRQ_PROBE
12 select GENERIC_ATOMIC64 12 select GENERIC_ATOMIC64
13 select GENERIC_IDLE_LOOP
14 select HARDIRQS_SW_RESEND 13 select HARDIRQS_SW_RESEND
15 select GENERIC_IRQ_SHOW 14 select GENERIC_IRQ_SHOW
16 select ARCH_HAVE_CUSTOM_GPIO_H 15 select ARCH_HAVE_CUSTOM_GPIO_H
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 3d769a7c4941..c3f2e0bc644a 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -41,7 +41,6 @@ config BLACKFIN
41 select USE_GENERIC_SMP_HELPERS if SMP 41 select USE_GENERIC_SMP_HELPERS if SMP
42 select HAVE_NMI_WATCHDOG if NMI_WATCHDOG 42 select HAVE_NMI_WATCHDOG if NMI_WATCHDOG
43 select GENERIC_SMP_IDLE_THREAD 43 select GENERIC_SMP_IDLE_THREAD
44 select GENERIC_IDLE_LOOP
45 select ARCH_USES_GETTIMEOFFSET if !GENERIC_CLOCKEVENTS 44 select ARCH_USES_GETTIMEOFFSET if !GENERIC_CLOCKEVENTS
46 select HAVE_MOD_ARCH_SPECIFIC 45 select HAVE_MOD_ARCH_SPECIFIC
47 select MODULES_USE_ELF_RELA 46 select MODULES_USE_ELF_RELA
diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig
index af2aa4b44140..f6a3648f5ec3 100644
--- a/arch/c6x/Kconfig
+++ b/arch/c6x/Kconfig
@@ -18,7 +18,6 @@ config C6X
18 select OF_EARLY_FLATTREE 18 select OF_EARLY_FLATTREE
19 select GENERIC_CLOCKEVENTS 19 select GENERIC_CLOCKEVENTS
20 select MODULES_USE_ELF_RELA 20 select MODULES_USE_ELF_RELA
21 select GENERIC_IDLE_LOOP
22 21
23config MMU 22config MMU
24 def_bool n 23 def_bool n
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 1dd36355a3cd..06dd026533e3 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -48,7 +48,6 @@ config CRIS
48 select GENERIC_IRQ_SHOW 48 select GENERIC_IRQ_SHOW
49 select GENERIC_IOMAP 49 select GENERIC_IOMAP
50 select GENERIC_SMP_IDLE_THREAD if ETRAX_ARCH_V32 50 select GENERIC_SMP_IDLE_THREAD if ETRAX_ARCH_V32
51 select GENERIC_IDLE_LOOP
52 select GENERIC_CMOS_UPDATE 51 select GENERIC_CMOS_UPDATE
53 select MODULES_USE_ELF_RELA 52 select MODULES_USE_ELF_RELA
54 select CLONE_BACKWARDS2 53 select CLONE_BACKWARDS2
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 0d998db2039e..2ce731f9aa4d 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -8,7 +8,6 @@ config FRV
8 select HAVE_GENERIC_HARDIRQS 8 select HAVE_GENERIC_HARDIRQS
9 select VIRT_TO_BUS 9 select VIRT_TO_BUS
10 select GENERIC_IRQ_SHOW 10 select GENERIC_IRQ_SHOW
11 select GENERIC_IDLE_LOOP
12 select HAVE_DEBUG_BUGVERBOSE 11 select HAVE_DEBUG_BUGVERBOSE
13 select ARCH_HAVE_NMI_SAFE_CMPXCHG 12 select ARCH_HAVE_NMI_SAFE_CMPXCHG
14 select GENERIC_CPU_DEVICES 13 select GENERIC_CPU_DEVICES
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 5374975fe800..79250de1b12a 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -8,7 +8,6 @@ config H8300
8 select VIRT_TO_BUS 8 select VIRT_TO_BUS
9 select ARCH_WANT_IPC_PARSE_VERSION 9 select ARCH_WANT_IPC_PARSE_VERSION
10 select GENERIC_IRQ_SHOW 10 select GENERIC_IRQ_SHOW
11 select GENERIC_IDLE_LOOP
12 select GENERIC_CPU_DEVICES 11 select GENERIC_CPU_DEVICES
13 select MODULES_USE_ELF_RELA 12 select MODULES_USE_ELF_RELA
14 select OLD_SIGSUSPEND3 13 select OLD_SIGSUSPEND3
diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index 6e3710e84a6c..e4decc6b8947 100644
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -24,7 +24,6 @@ config HEXAGON
24 select NO_IOPORT 24 select NO_IOPORT
25 select GENERIC_IOMAP 25 select GENERIC_IOMAP
26 select GENERIC_SMP_IDLE_THREAD 26 select GENERIC_SMP_IDLE_THREAD
27 select GENERIC_IDLE_LOOP
28 select STACKTRACE_SUPPORT 27 select STACKTRACE_SUPPORT
29 select KTIME_SCALAR 28 select KTIME_SCALAR
30 select GENERIC_CLOCKEVENTS 29 select GENERIC_CLOCKEVENTS
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index e0b39c3cb789..9a02f71c6b1f 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -35,7 +35,6 @@ config IA64
35 select ARCH_HAVE_NMI_SAFE_CMPXCHG 35 select ARCH_HAVE_NMI_SAFE_CMPXCHG
36 select GENERIC_IOMAP 36 select GENERIC_IOMAP
37 select GENERIC_SMP_IDLE_THREAD 37 select GENERIC_SMP_IDLE_THREAD
38 select GENERIC_IDLE_LOOP
39 select ARCH_INIT_TASK 38 select ARCH_INIT_TASK
40 select ARCH_TASK_STRUCT_ALLOCATOR 39 select ARCH_TASK_STRUCT_ALLOCATOR
41 select ARCH_THREAD_INFO_ALLOCATOR 40 select ARCH_THREAD_INFO_ALLOCATOR
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index af814fe478ae..bcd17b206571 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -13,7 +13,6 @@ config M32R
13 select VIRT_TO_BUS 13 select VIRT_TO_BUS
14 select GENERIC_IRQ_PROBE 14 select GENERIC_IRQ_PROBE
15 select GENERIC_IRQ_SHOW 15 select GENERIC_IRQ_SHOW
16 select GENERIC_IDLE_LOOP
17 select GENERIC_ATOMIC64 16 select GENERIC_ATOMIC64
18 select ARCH_USES_GETTIMEOFFSET 17 select ARCH_USES_GETTIMEOFFSET
19 select MODULES_USE_ELF_RELA 18 select MODULES_USE_ELF_RELA
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 41859405a853..6de813370b8c 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -6,7 +6,6 @@ config M68K
6 select HAVE_DEBUG_BUGVERBOSE 6 select HAVE_DEBUG_BUGVERBOSE
7 select HAVE_GENERIC_HARDIRQS 7 select HAVE_GENERIC_HARDIRQS
8 select GENERIC_IRQ_SHOW 8 select GENERIC_IRQ_SHOW
9 select GENERIC_IDLE_LOOP
10 select GENERIC_ATOMIC64 9 select GENERIC_ATOMIC64
11 select HAVE_UID16 10 select HAVE_UID16
12 select VIRT_TO_BUS 11 select VIRT_TO_BUS
diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
index 3164f6cebe2b..afc8973d1488 100644
--- a/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@@ -7,7 +7,6 @@ config METAG
7 select EMBEDDED 7 select EMBEDDED
8 select GENERIC_ATOMIC64 8 select GENERIC_ATOMIC64
9 select GENERIC_CLOCKEVENTS 9 select GENERIC_CLOCKEVENTS
10 select GENERIC_IDLE_LOOP
11 select GENERIC_IRQ_SHOW 10 select GENERIC_IRQ_SHOW
12 select GENERIC_SMP_IDLE_THREAD 11 select GENERIC_SMP_IDLE_THREAD
13 select HAVE_64BIT_ALIGNED_ACCESS 12 select HAVE_64BIT_ALIGNED_ACCESS
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 0bb0d519a233..a827057c7927 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -26,7 +26,6 @@ config MICROBLAZE
26 select GENERIC_CPU_DEVICES 26 select GENERIC_CPU_DEVICES
27 select GENERIC_ATOMIC64 27 select GENERIC_ATOMIC64
28 select GENERIC_CLOCKEVENTS 28 select GENERIC_CLOCKEVENTS
29 select GENERIC_IDLE_LOOP
30 select GENERIC_IDLE_POLL_SETUP 29 select GENERIC_IDLE_POLL_SETUP
31 select MODULES_USE_ELF_RELA 30 select MODULES_USE_ELF_RELA
32 select CLONE_BACKWARDS 31 select CLONE_BACKWARDS
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index e1a3d02af637..51244bf97271 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -34,7 +34,6 @@ config MIPS
34 select HAVE_MEMBLOCK_NODE_MAP 34 select HAVE_MEMBLOCK_NODE_MAP
35 select ARCH_DISCARD_MEMBLOCK 35 select ARCH_DISCARD_MEMBLOCK
36 select GENERIC_SMP_IDLE_THREAD 36 select GENERIC_SMP_IDLE_THREAD
37 select GENERIC_IDLE_LOOP
38 select BUILDTIME_EXTABLE_SORT 37 select BUILDTIME_EXTABLE_SORT
39 select GENERIC_CLOCKEVENTS 38 select GENERIC_CLOCKEVENTS
40 select GENERIC_CMOS_UPDATE 39 select GENERIC_CMOS_UPDATE
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index ae7158b69c9c..428da175d073 100644
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -13,7 +13,6 @@ config MN10300
13 select MODULES_USE_ELF_RELA 13 select MODULES_USE_ELF_RELA
14 select OLD_SIGSUSPEND3 14 select OLD_SIGSUSPEND3
15 select OLD_SIGACTION 15 select OLD_SIGACTION
16 select GENERIC_IDLE_LOOP
17 16
18config AM33_2 17config AM33_2
19 def_bool n 18 def_bool n
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index e111b5200cd9..9ab3bf2eca8d 100644
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -21,7 +21,6 @@ config OPENRISC
21 select GENERIC_CLOCKEVENTS 21 select GENERIC_CLOCKEVENTS
22 select GENERIC_STRNCPY_FROM_USER 22 select GENERIC_STRNCPY_FROM_USER
23 select GENERIC_STRNLEN_USER 23 select GENERIC_STRNLEN_USER
24 select GENERIC_IDLE_LOOP
25 select MODULES_USE_ELF_RELA 24 select MODULES_USE_ELF_RELA
26 25
27config MMU 26config MMU
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 0821e702d03f..0339181bf3ac 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -18,7 +18,6 @@ config PARISC
18 select GENERIC_PCI_IOMAP 18 select GENERIC_PCI_IOMAP
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 GENERIC_IDLE_LOOP
22 select GENERIC_STRNCPY_FROM_USER 21 select GENERIC_STRNCPY_FROM_USER
23 select SYSCTL_ARCH_UNALIGN_ALLOW 22 select SYSCTL_ARCH_UNALIGN_ALLOW
24 select HAVE_MOD_ARCH_SPECIFIC 23 select HAVE_MOD_ARCH_SPECIFIC
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 19de32c52da5..ea5bb045983a 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -133,7 +133,6 @@ config PPC
133 select HAVE_ARCH_JUMP_LABEL 133 select HAVE_ARCH_JUMP_LABEL
134 select ARCH_HAVE_NMI_SAFE_CMPXCHG 134 select ARCH_HAVE_NMI_SAFE_CMPXCHG
135 select GENERIC_SMP_IDLE_THREAD 135 select GENERIC_SMP_IDLE_THREAD
136 select GENERIC_IDLE_LOOP
137 select GENERIC_CMOS_UPDATE 136 select GENERIC_CMOS_UPDATE
138 select GENERIC_TIME_VSYSCALL_OLD 137 select GENERIC_TIME_VSYSCALL_OLD
139 select GENERIC_CLOCKEVENTS 138 select GENERIC_CLOCKEVENTS
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 749513d73e47..eb8fb629f00b 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -97,7 +97,6 @@ config S390
97 select CLONE_BACKWARDS2 97 select CLONE_BACKWARDS2
98 select GENERIC_CLOCKEVENTS 98 select GENERIC_CLOCKEVENTS
99 select GENERIC_CPU_DEVICES if !SMP 99 select GENERIC_CPU_DEVICES if !SMP
100 select GENERIC_IDLE_LOOP
101 select GENERIC_KERNEL_THREAD 100 select GENERIC_KERNEL_THREAD
102 select GENERIC_SMP_IDLE_THREAD 101 select GENERIC_SMP_IDLE_THREAD
103 select GENERIC_TIME_VSYSCALL_OLD 102 select GENERIC_TIME_VSYSCALL_OLD
diff --git a/arch/score/Kconfig b/arch/score/Kconfig
index eaac45de65be..c8def8bc9020 100644
--- a/arch/score/Kconfig
+++ b/arch/score/Kconfig
@@ -11,7 +11,6 @@ config SCORE
11 select ARCH_DISCARD_MEMBLOCK 11 select ARCH_DISCARD_MEMBLOCK
12 select GENERIC_CPU_DEVICES 12 select GENERIC_CPU_DEVICES
13 select GENERIC_CLOCKEVENTS 13 select GENERIC_CLOCKEVENTS
14 select GENERIC_IDLE_LOOP
15 select HAVE_MOD_ARCH_SPECIFIC 14 select HAVE_MOD_ARCH_SPECIFIC
16 select VIRT_TO_BUS 15 select VIRT_TO_BUS
17 select MODULES_USE_ELF_REL 16 select MODULES_USE_ELF_REL
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 0917fc3f39c0..1ea597c6497a 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -33,7 +33,6 @@ config SUPERH
33 select GENERIC_ATOMIC64 33 select GENERIC_ATOMIC64
34 select GENERIC_IRQ_SHOW 34 select GENERIC_IRQ_SHOW
35 select GENERIC_SMP_IDLE_THREAD 35 select GENERIC_SMP_IDLE_THREAD
36 select GENERIC_IDLE_LOOP
37 select GENERIC_IDLE_POLL_SETUP 36 select GENERIC_IDLE_POLL_SETUP
38 select GENERIC_CLOCKEVENTS 37 select GENERIC_CLOCKEVENTS
39 select GENERIC_CMOS_UPDATE if SH_SH03 || SH_DREAMCAST 38 select GENERIC_CMOS_UPDATE if SH_SH03 || SH_DREAMCAST
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index ee5eacc5a649..3d361f236308 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -37,7 +37,6 @@ config SPARC
37 select GENERIC_SMP_IDLE_THREAD 37 select GENERIC_SMP_IDLE_THREAD
38 select GENERIC_CMOS_UPDATE 38 select GENERIC_CMOS_UPDATE
39 select GENERIC_CLOCKEVENTS 39 select GENERIC_CLOCKEVENTS
40 select GENERIC_IDLE_LOOP
41 select GENERIC_STRNCPY_FROM_USER 40 select GENERIC_STRNCPY_FROM_USER
42 select GENERIC_STRNLEN_USER 41 select GENERIC_STRNLEN_USER
43 select MODULES_USE_ELF_RELA 42 select MODULES_USE_ELF_RELA
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 85b2edeade31..25877aebc685 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -22,7 +22,6 @@ config TILE
22 select ARCH_HAVE_NMI_SAFE_CMPXCHG 22 select ARCH_HAVE_NMI_SAFE_CMPXCHG
23 select GENERIC_CLOCKEVENTS 23 select GENERIC_CLOCKEVENTS
24 select MODULES_USE_ELF_RELA 24 select MODULES_USE_ELF_RELA
25 select GENERIC_IDLE_LOOP
26 25
27# FIXME: investigate whether we need/want these options. 26# FIXME: investigate whether we need/want these options.
28# select HAVE_IOREMAP_PROT 27# select HAVE_IOREMAP_PROT
diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
index 57834067a511..bceee6623b00 100644
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@ -12,7 +12,6 @@ config UML
12 select GENERIC_CPU_DEVICES 12 select GENERIC_CPU_DEVICES
13 select GENERIC_IO 13 select GENERIC_IO
14 select GENERIC_CLOCKEVENTS 14 select GENERIC_CLOCKEVENTS
15 select GENERIC_IDLE_LOOP
16 select TTY # Needed for line.c 15 select TTY # Needed for line.c
17 16
18config MMU 17config MMU
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index e12678daaed1..2943e3acdf0c 100644
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -17,7 +17,6 @@ config UNICORE32
17 select ARCH_WANT_FRAME_POINTERS 17 select ARCH_WANT_FRAME_POINTERS
18 select GENERIC_IOMAP 18 select GENERIC_IOMAP
19 select MODULES_USE_ELF_REL 19 select MODULES_USE_ELF_REL
20 select GENERIC_IDLE_LOOP
21 help 20 help
22 UniCore-32 is 32-bit Instruction Set Architecture, 21 UniCore-32 is 32-bit Instruction Set Architecture,
23 including a series of low-power-consumption RISC chip 22 including a series of low-power-consumption RISC chip
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 734152d85fd0..fcf293994992 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -97,7 +97,6 @@ config X86
97 select GENERIC_IOMAP 97 select GENERIC_IOMAP
98 select DCACHE_WORD_ACCESS 98 select DCACHE_WORD_ACCESS
99 select GENERIC_SMP_IDLE_THREAD 99 select GENERIC_SMP_IDLE_THREAD
100 select GENERIC_IDLE_LOOP
101 select ARCH_WANT_IPC_PARSE_VERSION if X86_32 100 select ARCH_WANT_IPC_PARSE_VERSION if X86_32
102 select HAVE_ARCH_SECCOMP_FILTER 101 select HAVE_ARCH_SECCOMP_FILTER
103 select BUILDTIME_EXTABLE_SORT 102 select BUILDTIME_EXTABLE_SORT
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index e0144ff4624d..b09de49dbec5 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -19,7 +19,6 @@ config XTENSA
19 select CLONE_BACKWARDS 19 select CLONE_BACKWARDS
20 select IRQ_DOMAIN 20 select IRQ_DOMAIN
21 select HAVE_OPROFILE 21 select HAVE_OPROFILE
22 select GENERIC_IDLE_LOOP
23 help 22 help
24 Xtensa processors are 32-bit RISC machines designed by Tensilica 23 Xtensa processors are 32-bit RISC machines designed by Tensilica
25 primarily for embedded systems. These processors are both 24 primarily for embedded systems. These processors are both
diff --git a/kernel/cpu/idle.c b/kernel/cpu/idle.c
index 54c320383934..168cf407a254 100644
--- a/kernel/cpu/idle.c
+++ b/kernel/cpu/idle.c
@@ -10,13 +10,6 @@
10 10
11#include <trace/events/power.h> 11#include <trace/events/power.h>
12 12
13#ifndef CONFIG_GENERIC_IDLE_LOOP
14void cpu_startup_entry(enum cpuhp_state state)
15{
16 cpu_idle();
17}
18#else
19
20static int __read_mostly cpu_idle_force_poll; 13static int __read_mostly cpu_idle_force_poll;
21 14
22void cpu_idle_poll_ctrl(bool enable) 15void cpu_idle_poll_ctrl(bool enable)
@@ -112,4 +105,3 @@ void cpu_startup_entry(enum cpuhp_state state)
112 arch_cpu_idle_prepare(); 105 arch_cpu_idle_prepare();
113 cpu_idle_loop(); 106 cpu_idle_loop();
114} 107}
115#endif