aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/Kconfig2
-rw-r--r--arch/avr32/Kconfig2
-rw-r--r--arch/blackfin/Kconfig2
-rw-r--r--arch/c6x/Kconfig1
-rw-r--r--arch/h8300/Kconfig.cpu2
-rw-r--r--arch/hexagon/Kconfig1
-rw-r--r--arch/m68k/Kconfig4
-rw-r--r--arch/microblaze/Kconfig2
-rw-r--r--arch/mips/Kconfig2
-rw-r--r--arch/mn10300/Kconfig1
-rw-r--r--arch/openrisc/Kconfig1
-rw-r--r--arch/powerpc/Kconfig1
-rw-r--r--arch/s390/Kconfig2
-rw-r--r--arch/score/Kconfig1
-rw-r--r--arch/sh/Kconfig3
-rw-r--r--arch/sparc/Kconfig2
-rw-r--r--arch/tile/Kconfig2
-rw-r--r--arch/um/Kconfig.um1
-rw-r--r--arch/unicore32/Kconfig2
-rw-r--r--arch/x86/Kconfig2
-rw-r--r--init/Kconfig1
-rw-r--r--kernel/time/Kconfig73
22 files changed, 42 insertions, 68 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index feccc1d37ecf..c1e5f07fab93 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1459,8 +1459,6 @@ endmenu
1459 1459
1460menu "Kernel Features" 1460menu "Kernel Features"
1461 1461
1462source "kernel/time/Kconfig"
1463
1464config HAVE_SMP 1462config HAVE_SMP
1465 bool 1463 bool
1466 help 1464 help
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 0bd13ab9f43b..f8bc2d27d148 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -61,8 +61,6 @@ source "kernel/Kconfig.freezer"
61 61
62menu "System Type and features" 62menu "System Type and features"
63 63
64source "kernel/time/Kconfig"
65
66config SUBARCH_AVR32B 64config SUBARCH_AVR32B
67 bool 65 bool
68config MMU 66config MMU
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index bc21de2e8fed..f7897eefa630 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -631,8 +631,6 @@ config GPTMR0_CLOCKSOURCE
631 depends on !TICKSOURCE_GPTMR0 631 depends on !TICKSOURCE_GPTMR0
632endmenu 632endmenu
633 633
634source kernel/time/Kconfig
635
636comment "Misc" 634comment "Misc"
637 635
638choice 636choice
diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig
index 30c04c658b9e..9d446eff2c04 100644
--- a/arch/c6x/Kconfig
+++ b/arch/c6x/Kconfig
@@ -132,7 +132,6 @@ source "mm/Kconfig"
132source "kernel/Kconfig.preempt" 132source "kernel/Kconfig.preempt"
133 133
134source "kernel/Kconfig.hz" 134source "kernel/Kconfig.hz"
135source "kernel/time/Kconfig"
136 135
137endmenu 136endmenu
138 137
diff --git a/arch/h8300/Kconfig.cpu b/arch/h8300/Kconfig.cpu
index 15c22286ae79..321f3922728b 100644
--- a/arch/h8300/Kconfig.cpu
+++ b/arch/h8300/Kconfig.cpu
@@ -1,7 +1,5 @@
1menu "Processor type and features" 1menu "Processor type and features"
2 2
3source "kernel/time/Kconfig"
4
5choice 3choice
6 prompt "H8/300 platform" 4 prompt "H8/300 platform"
7 default H8300H_GENERIC 5 default H8300H_GENERIC
diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index 7727ed9d2bf3..35f6c32d040c 100644
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -183,7 +183,6 @@ endchoice
183source "mm/Kconfig" 183source "mm/Kconfig"
184 184
185source "kernel/Kconfig.hz" 185source "kernel/Kconfig.hz"
186source "kernel/time/Kconfig"
187 186
188config GENERIC_GPIO 187config GENERIC_GPIO
189 bool "Generic GPIO support" 188 bool "Generic GPIO support"
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 2f4b0f0610d6..cac5b6be572a 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -106,10 +106,6 @@ if COLDFIRE
106source "kernel/Kconfig.preempt" 106source "kernel/Kconfig.preempt"
107endif 107endif
108 108
109if !MMU || COLDFIRE
110source "kernel/time/Kconfig"
111endif
112
113source "mm/Kconfig" 109source "mm/Kconfig"
114 110
115endmenu 111endmenu
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 3e786ac9a655..83460468998d 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -74,8 +74,6 @@ source "arch/microblaze/platform/Kconfig.platform"
74 74
75menu "Processor type and features" 75menu "Processor type and features"
76 76
77source "kernel/time/Kconfig"
78
79source "kernel/Kconfig.preempt" 77source "kernel/Kconfig.preempt"
80 78
81source "kernel/Kconfig.hz" 79source "kernel/Kconfig.hz"
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index c9c330bc4e76..b65a730cba75 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2205,8 +2205,6 @@ config NR_CPUS
2205 performance should round up your number of processors to the next 2205 performance should round up your number of processors to the next
2206 power of two. 2206 power of two.
2207 2207
2208source "kernel/time/Kconfig"
2209
2210# 2208#
2211# Timer Interrupt Frequency Configuration 2209# Timer Interrupt Frequency Configuration
2212# 2210#
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index 7f78057af2f5..687f9b4a2ed6 100644
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -226,7 +226,6 @@ config MN10300_USING_JTAG
226 single-stepping, which are taken over completely by the JTAG unit. 226 single-stepping, which are taken over completely by the JTAG unit.
227 227
228source "kernel/Kconfig.hz" 228source "kernel/Kconfig.hz"
229source "kernel/time/Kconfig"
230 229
231config MN10300_RTC 230config MN10300_RTC
232 bool "Using MN10300 RTC" 231 bool "Using MN10300 RTC"
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index be04485431fe..70653039e79b 100644
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -106,7 +106,6 @@ config OPENRISC_HAVE_INST_DIV
106endmenu 106endmenu
107 107
108 108
109source "kernel/time/Kconfig"
110source kernel/Kconfig.hz 109source kernel/Kconfig.hz
111source kernel/Kconfig.preempt 110source kernel/Kconfig.preempt
112source "mm/Kconfig" 111source "mm/Kconfig"
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 901215f7a2f2..d47cf7ffa792 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -278,7 +278,6 @@ config HIGHMEM
278 bool "High memory support" 278 bool "High memory support"
279 depends on PPC32 279 depends on PPC32
280 280
281source kernel/time/Kconfig
282source kernel/Kconfig.hz 281source kernel/Kconfig.hz
283source kernel/Kconfig.preempt 282source kernel/Kconfig.preempt
284source "fs/Kconfig.binfmt" 283source "fs/Kconfig.binfmt"
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index f9edb9303a7e..d0325d9ae21f 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -131,8 +131,6 @@ menu "Base setup"
131 131
132comment "Processor type and features" 132comment "Processor type and features"
133 133
134source "kernel/time/Kconfig"
135
136config 64BIT 134config 64BIT
137 def_bool y 135 def_bool y
138 prompt "64 bit kernel" 136 prompt "64 bit kernel"
diff --git a/arch/score/Kconfig b/arch/score/Kconfig
index f5d3b3237419..ba0f412920be 100644
--- a/arch/score/Kconfig
+++ b/arch/score/Kconfig
@@ -66,7 +66,6 @@ config MEMORY_START
66 hex 66 hex
67 default 0xa0000000 67 default 0xa0000000
68 68
69source "kernel/time/Kconfig"
70source "kernel/Kconfig.hz" 69source "kernel/Kconfig.hz"
71source "kernel/Kconfig.preempt" 70source "kernel/Kconfig.preempt"
72 71
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index cffd8b0082d5..820dfe3c7b69 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -577,9 +577,6 @@ config SH_CLK_CPG_LEGACY
577 depends on SH_CLK_CPG 577 depends on SH_CLK_CPG
578 def_bool y if !CPU_SUBTYPE_SH7785 && !ARCH_SHMOBILE && \ 578 def_bool y if !CPU_SUBTYPE_SH7785 && !ARCH_SHMOBILE && \
579 !CPU_SHX3 && !CPU_SUBTYPE_SH7757 579 !CPU_SHX3 && !CPU_SUBTYPE_SH7757
580
581source "kernel/time/Kconfig"
582
583endmenu 580endmenu
584 581
585menu "CPU Frequency scaling" 582menu "CPU Frequency scaling"
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 33399d3d90bc..b5a035a5c53a 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -266,8 +266,6 @@ config HOTPLUG_CPU
266 can be controlled through /sys/devices/system/cpu/cpu#. 266 can be controlled through /sys/devices/system/cpu/cpu#.
267 Say N if you want to disable CPU hotplug. 267 Say N if you want to disable CPU hotplug.
268 268
269source "kernel/time/Kconfig"
270
271if SPARC64 269if SPARC64
272source "drivers/cpufreq/Kconfig" 270source "drivers/cpufreq/Kconfig"
273 271
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index b56772cac5d2..4eec3a1a72c0 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -136,8 +136,6 @@ config NR_CPUS
136 smaller kernel memory footprint results from using a smaller 136 smaller kernel memory footprint results from using a smaller
137 value on chips with fewer tiles. 137 value on chips with fewer tiles.
138 138
139source "kernel/time/Kconfig"
140
141source "kernel/Kconfig.hz" 139source "kernel/Kconfig.hz"
142 140
143config KEXEC 141config KEXEC
diff --git a/arch/um/Kconfig.um b/arch/um/Kconfig.um
index 70fd690964e4..bf87f25eb2de 100644
--- a/arch/um/Kconfig.um
+++ b/arch/um/Kconfig.um
@@ -10,7 +10,6 @@ config STATIC_LINK
10 2.75G) for UML. 10 2.75G) for UML.
11 11
12source "mm/Kconfig" 12source "mm/Kconfig"
13source "kernel/time/Kconfig"
14 13
15config LD_SCRIPT_STATIC 14config LD_SCRIPT_STATIC
16 bool 15 bool
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index a25ca7606bea..47ad5210606f 100644
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -143,8 +143,6 @@ endmenu
143 143
144menu "Kernel Features" 144menu "Kernel Features"
145 145
146source "kernel/time/Kconfig"
147
148source "kernel/Kconfig.preempt" 146source "kernel/Kconfig.preempt"
149 147
150source "kernel/Kconfig.hz" 148source "kernel/Kconfig.hz"
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 3b0a9217836a..1b1e0493ef7f 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -241,8 +241,6 @@ config ZONE_DMA
241 241
242 If unsure, say Y. 242 If unsure, say Y.
243 243
244source "kernel/time/Kconfig"
245
246config SMP 244config SMP
247 bool "Symmetric multi-processing support" 245 bool "Symmetric multi-processing support"
248 ---help--- 246 ---help---
diff --git a/init/Kconfig b/init/Kconfig
index 6cfd71d06463..528a0c4111cc 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -387,6 +387,7 @@ config AUDIT_LOGINUID_IMMUTABLE
387 but may not be backwards compatible with older init systems. 387 but may not be backwards compatible with older init systems.
388 388
389source "kernel/irq/Kconfig" 389source "kernel/irq/Kconfig"
390source "kernel/time/Kconfig"
390 391
391menu "RCU Subsystem" 392menu "RCU Subsystem"
392 393
diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
index f6ebc4ff702a..fd42bd452b75 100644
--- a/kernel/time/Kconfig
+++ b/kernel/time/Kconfig
@@ -2,38 +2,6 @@
2# Timer subsystem related configuration options 2# Timer subsystem related configuration options
3# 3#
4 4
5# Core internal switch. Selected by NO_HZ / HIGH_RES_TIMERS. This is
6# only related to the tick functionality. Oneshot clockevent devices
7# are supported independ of this.
8config TICK_ONESHOT
9 bool
10
11config NO_HZ
12 bool "Tickless System (Dynamic Ticks)"
13 depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS
14 select TICK_ONESHOT
15 help
16 This option enables a tickless system: timer interrupts will
17 only trigger on an as-needed basis both when the system is
18 busy and when the system is idle.
19
20config HIGH_RES_TIMERS
21 bool "High Resolution Timer Support"
22 depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS
23 select TICK_ONESHOT
24 help
25 This option enables high resolution timer support. If your
26 hardware is not capable then this option only increases
27 the size of the kernel image.
28
29config GENERIC_CLOCKEVENTS_BUILD
30 bool
31 default y
32 depends on GENERIC_CLOCKEVENTS
33
34config GENERIC_CLOCKEVENTS_MIN_ADJUST
35 bool
36
37# Options selectable by arch Kconfig 5# Options selectable by arch Kconfig
38 6
39# Watchdog function for clocksources to detect instabilities 7# Watchdog function for clocksources to detect instabilities
@@ -60,11 +28,52 @@ config ARCH_USES_GETTIMEOFFSET
60config GENERIC_CLOCKEVENTS 28config GENERIC_CLOCKEVENTS
61 bool 29 bool
62 30
31# Migration helper. Builds, but does not invoke
32config GENERIC_CLOCKEVENTS_BUILD
33 bool
34 default y
35 depends on GENERIC_CLOCKEVENTS
36
63# Clockevents broadcasting infrastructure 37# Clockevents broadcasting infrastructure
64config GENERIC_CLOCKEVENTS_BROADCAST 38config GENERIC_CLOCKEVENTS_BROADCAST
65 bool 39 bool
66 depends on GENERIC_CLOCKEVENTS 40 depends on GENERIC_CLOCKEVENTS
67 41
42# Automatically adjust the min. reprogramming time for
43# clock event device
44config GENERIC_CLOCKEVENTS_MIN_ADJUST
45 bool
46
68# Generic update of CMOS clock 47# Generic update of CMOS clock
69config GENERIC_CMOS_UPDATE 48config GENERIC_CMOS_UPDATE
70 bool 49 bool
50
51if GENERIC_CLOCKEVENTS
52menu "Timers subsystem"
53
54# Core internal switch. Selected by NO_HZ / HIGH_RES_TIMERS. This is
55# only related to the tick functionality. Oneshot clockevent devices
56# are supported independ of this.
57config TICK_ONESHOT
58 bool
59
60config NO_HZ
61 bool "Tickless System (Dynamic Ticks)"
62 depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS
63 select TICK_ONESHOT
64 help
65 This option enables a tickless system: timer interrupts will
66 only trigger on an as-needed basis both when the system is
67 busy and when the system is idle.
68
69config HIGH_RES_TIMERS
70 bool "High Resolution Timer Support"
71 depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS
72 select TICK_ONESHOT
73 help
74 This option enables high resolution timer support. If your
75 hardware is not capable then this option only increases
76 the size of the kernel image.
77
78endmenu
79endif
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-29 00:36:00 -0500