timers: Fixup the Kconfig consolidation fallout
Sigh, I missed to check which architecture Kconfig files actually include the core Kconfig file. There are a few which did not. So we broke them. Instead of adding the includes to those, we are better off to move the include to init/Kconfig like we did already with irqs and others. This does not change anything for the architectures using the old style periodic timer mode. It just solves the build wreckage there. For those architectures which use the clock events infrastructure it moves the include of the core Kconfig file to "General setup" which is a way more logical place than having it at random locations specified by the architecture specific Kconfigs. Reported-by: Ingo Molnar <mingo@kernel.org> Cc: Anna-Maria Gleixner <anna-maria@glx-um.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Родитель
bdebaf80a0
Коммит
764e0da14f
|
@ -1459,8 +1459,6 @@ endmenu
|
|||
|
||||
menu "Kernel Features"
|
||||
|
||||
source "kernel/time/Kconfig"
|
||||
|
||||
config HAVE_SMP
|
||||
bool
|
||||
help
|
||||
|
|
|
@ -61,8 +61,6 @@ source "kernel/Kconfig.freezer"
|
|||
|
||||
menu "System Type and features"
|
||||
|
||||
source "kernel/time/Kconfig"
|
||||
|
||||
config SUBARCH_AVR32B
|
||||
bool
|
||||
config MMU
|
||||
|
|
|
@ -631,8 +631,6 @@ config GPTMR0_CLOCKSOURCE
|
|||
depends on !TICKSOURCE_GPTMR0
|
||||
endmenu
|
||||
|
||||
source kernel/time/Kconfig
|
||||
|
||||
comment "Misc"
|
||||
|
||||
choice
|
||||
|
|
|
@ -132,7 +132,6 @@ source "mm/Kconfig"
|
|||
source "kernel/Kconfig.preempt"
|
||||
|
||||
source "kernel/Kconfig.hz"
|
||||
source "kernel/time/Kconfig"
|
||||
|
||||
endmenu
|
||||
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
menu "Processor type and features"
|
||||
|
||||
source "kernel/time/Kconfig"
|
||||
|
||||
choice
|
||||
prompt "H8/300 platform"
|
||||
default H8300H_GENERIC
|
||||
|
|
|
@ -183,7 +183,6 @@ endchoice
|
|||
source "mm/Kconfig"
|
||||
|
||||
source "kernel/Kconfig.hz"
|
||||
source "kernel/time/Kconfig"
|
||||
|
||||
config GENERIC_GPIO
|
||||
bool "Generic GPIO support"
|
||||
|
|
|
@ -106,10 +106,6 @@ if COLDFIRE
|
|||
source "kernel/Kconfig.preempt"
|
||||
endif
|
||||
|
||||
if !MMU || COLDFIRE
|
||||
source "kernel/time/Kconfig"
|
||||
endif
|
||||
|
||||
source "mm/Kconfig"
|
||||
|
||||
endmenu
|
||||
|
|
|
@ -74,8 +74,6 @@ source "arch/microblaze/platform/Kconfig.platform"
|
|||
|
||||
menu "Processor type and features"
|
||||
|
||||
source "kernel/time/Kconfig"
|
||||
|
||||
source "kernel/Kconfig.preempt"
|
||||
|
||||
source "kernel/Kconfig.hz"
|
||||
|
|
|
@ -2205,8 +2205,6 @@ config NR_CPUS
|
|||
performance should round up your number of processors to the next
|
||||
power of two.
|
||||
|
||||
source "kernel/time/Kconfig"
|
||||
|
||||
#
|
||||
# Timer Interrupt Frequency Configuration
|
||||
#
|
||||
|
|
|
@ -226,7 +226,6 @@ config MN10300_USING_JTAG
|
|||
single-stepping, which are taken over completely by the JTAG unit.
|
||||
|
||||
source "kernel/Kconfig.hz"
|
||||
source "kernel/time/Kconfig"
|
||||
|
||||
config MN10300_RTC
|
||||
bool "Using MN10300 RTC"
|
||||
|
|
|
@ -106,7 +106,6 @@ config OPENRISC_HAVE_INST_DIV
|
|||
endmenu
|
||||
|
||||
|
||||
source "kernel/time/Kconfig"
|
||||
source kernel/Kconfig.hz
|
||||
source kernel/Kconfig.preempt
|
||||
source "mm/Kconfig"
|
||||
|
|
|
@ -278,7 +278,6 @@ config HIGHMEM
|
|||
bool "High memory support"
|
||||
depends on PPC32
|
||||
|
||||
source kernel/time/Kconfig
|
||||
source kernel/Kconfig.hz
|
||||
source kernel/Kconfig.preempt
|
||||
source "fs/Kconfig.binfmt"
|
||||
|
|
|
@ -131,8 +131,6 @@ menu "Base setup"
|
|||
|
||||
comment "Processor type and features"
|
||||
|
||||
source "kernel/time/Kconfig"
|
||||
|
||||
config 64BIT
|
||||
def_bool y
|
||||
prompt "64 bit kernel"
|
||||
|
|
|
@ -66,7 +66,6 @@ config MEMORY_START
|
|||
hex
|
||||
default 0xa0000000
|
||||
|
||||
source "kernel/time/Kconfig"
|
||||
source "kernel/Kconfig.hz"
|
||||
source "kernel/Kconfig.preempt"
|
||||
|
||||
|
|
|
@ -577,9 +577,6 @@ config SH_CLK_CPG_LEGACY
|
|||
depends on SH_CLK_CPG
|
||||
def_bool y if !CPU_SUBTYPE_SH7785 && !ARCH_SHMOBILE && \
|
||||
!CPU_SHX3 && !CPU_SUBTYPE_SH7757
|
||||
|
||||
source "kernel/time/Kconfig"
|
||||
|
||||
endmenu
|
||||
|
||||
menu "CPU Frequency scaling"
|
||||
|
|
|
@ -266,8 +266,6 @@ config HOTPLUG_CPU
|
|||
can be controlled through /sys/devices/system/cpu/cpu#.
|
||||
Say N if you want to disable CPU hotplug.
|
||||
|
||||
source "kernel/time/Kconfig"
|
||||
|
||||
if SPARC64
|
||||
source "drivers/cpufreq/Kconfig"
|
||||
|
||||
|
|
|
@ -136,8 +136,6 @@ config NR_CPUS
|
|||
smaller kernel memory footprint results from using a smaller
|
||||
value on chips with fewer tiles.
|
||||
|
||||
source "kernel/time/Kconfig"
|
||||
|
||||
source "kernel/Kconfig.hz"
|
||||
|
||||
config KEXEC
|
||||
|
|
|
@ -10,7 +10,6 @@ config STATIC_LINK
|
|||
2.75G) for UML.
|
||||
|
||||
source "mm/Kconfig"
|
||||
source "kernel/time/Kconfig"
|
||||
|
||||
config LD_SCRIPT_STATIC
|
||||
bool
|
||||
|
|
|
@ -143,8 +143,6 @@ endmenu
|
|||
|
||||
menu "Kernel Features"
|
||||
|
||||
source "kernel/time/Kconfig"
|
||||
|
||||
source "kernel/Kconfig.preempt"
|
||||
|
||||
source "kernel/Kconfig.hz"
|
||||
|
|
|
@ -241,8 +241,6 @@ config ZONE_DMA
|
|||
|
||||
If unsure, say Y.
|
||||
|
||||
source "kernel/time/Kconfig"
|
||||
|
||||
config SMP
|
||||
bool "Symmetric multi-processing support"
|
||||
---help---
|
||||
|
|
|
@ -387,6 +387,7 @@ config AUDIT_LOGINUID_IMMUTABLE
|
|||
but may not be backwards compatible with older init systems.
|
||||
|
||||
source "kernel/irq/Kconfig"
|
||||
source "kernel/time/Kconfig"
|
||||
|
||||
menu "RCU Subsystem"
|
||||
|
||||
|
|
|
@ -2,38 +2,6 @@
|
|||
# Timer subsystem related configuration options
|
||||
#
|
||||
|
||||
# Core internal switch. Selected by NO_HZ / HIGH_RES_TIMERS. This is
|
||||
# only related to the tick functionality. Oneshot clockevent devices
|
||||
# are supported independ of this.
|
||||
config TICK_ONESHOT
|
||||
bool
|
||||
|
||||
config NO_HZ
|
||||
bool "Tickless System (Dynamic Ticks)"
|
||||
depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS
|
||||
select TICK_ONESHOT
|
||||
help
|
||||
This option enables a tickless system: timer interrupts will
|
||||
only trigger on an as-needed basis both when the system is
|
||||
busy and when the system is idle.
|
||||
|
||||
config HIGH_RES_TIMERS
|
||||
bool "High Resolution Timer Support"
|
||||
depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS
|
||||
select TICK_ONESHOT
|
||||
help
|
||||
This option enables high resolution timer support. If your
|
||||
hardware is not capable then this option only increases
|
||||
the size of the kernel image.
|
||||
|
||||
config GENERIC_CLOCKEVENTS_BUILD
|
||||
bool
|
||||
default y
|
||||
depends on GENERIC_CLOCKEVENTS
|
||||
|
||||
config GENERIC_CLOCKEVENTS_MIN_ADJUST
|
||||
bool
|
||||
|
||||
# Options selectable by arch Kconfig
|
||||
|
||||
# Watchdog function for clocksources to detect instabilities
|
||||
|
@ -60,11 +28,52 @@ config ARCH_USES_GETTIMEOFFSET
|
|||
config GENERIC_CLOCKEVENTS
|
||||
bool
|
||||
|
||||
# Migration helper. Builds, but does not invoke
|
||||
config GENERIC_CLOCKEVENTS_BUILD
|
||||
bool
|
||||
default y
|
||||
depends on GENERIC_CLOCKEVENTS
|
||||
|
||||
# Clockevents broadcasting infrastructure
|
||||
config GENERIC_CLOCKEVENTS_BROADCAST
|
||||
bool
|
||||
depends on GENERIC_CLOCKEVENTS
|
||||
|
||||
# Automatically adjust the min. reprogramming time for
|
||||
# clock event device
|
||||
config GENERIC_CLOCKEVENTS_MIN_ADJUST
|
||||
bool
|
||||
|
||||
# Generic update of CMOS clock
|
||||
config GENERIC_CMOS_UPDATE
|
||||
bool
|
||||
|
||||
if GENERIC_CLOCKEVENTS
|
||||
menu "Timers subsystem"
|
||||
|
||||
# Core internal switch. Selected by NO_HZ / HIGH_RES_TIMERS. This is
|
||||
# only related to the tick functionality. Oneshot clockevent devices
|
||||
# are supported independ of this.
|
||||
config TICK_ONESHOT
|
||||
bool
|
||||
|
||||
config NO_HZ
|
||||
bool "Tickless System (Dynamic Ticks)"
|
||||
depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS
|
||||
select TICK_ONESHOT
|
||||
help
|
||||
This option enables a tickless system: timer interrupts will
|
||||
only trigger on an as-needed basis both when the system is
|
||||
busy and when the system is idle.
|
||||
|
||||
config HIGH_RES_TIMERS
|
||||
bool "High Resolution Timer Support"
|
||||
depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS
|
||||
select TICK_ONESHOT
|
||||
help
|
||||
This option enables high resolution timer support. If your
|
||||
hardware is not capable then this option only increases
|
||||
the size of the kernel image.
|
||||
|
||||
endmenu
|
||||
endif
|
||||
|
|
Загрузка…
Ссылка в новой задаче