Commit a15f6b92 authored Mar 10, 2019 by Linus Torvalds

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fix from Thomas Gleixner:
 "A single fix to prevent a unmet dependencies warning in Kconfig"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  time: Make VIRT_CPU_ACCOUNTING_GEN depend on GENERIC_CLOCKEVENTS

parents 9e55f87c 041a1574

init/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -382,6 +382,7 @@ config VIRT_CPU_ACCOUNTING_GEN
		bool "Full dynticks CPU time accounting"
		depends on HAVE_CONTEXT_TRACKING
		depends on HAVE_VIRT_CPU_ACCOUNTING_GEN
		depends on GENERIC_CLOCKEVENTS
		select VIRT_CPU_ACCOUNTING
		select CONTEXT_TRACKING
		help