diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-10 13:58:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-10 13:58:33 -0700 |
| commit | a15f6b923e1e1040edc79f222d5d229ea8097259 (patch) | |
| tree | 747b1671ab844c0b417ee98825f5239a1dfeed58 /init | |
| parent | 9e55f87c0e3b3db11f52834222f881094eb97205 (diff) | |
| parent | 041a15744a7fb4e9b2759611e44fb8847960564e (diff) | |
| download | linux-a15f6b923e1e1040edc79f222d5d229ea8097259.tar.gz linux-a15f6b923e1e1040edc79f222d5d229ea8097259.tar.bz2 linux-a15f6b923e1e1040edc79f222d5d229ea8097259.zip | |
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
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 53b54214a36e..811641cc81e8 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -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 |