diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-10-03 07:53:25 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-03 07:53:25 +0200 |
| commit | 19f29887a73e32c52171f2725ac2d7561adab62b (patch) | |
| tree | 2c71002d25c8cca2e9ea92dee3b79682b7ddf8f7 /kernel | |
| parent | Merge tag 'v3.12-rc3' into timers/core (diff) | |
| parent | ARM: Kconfig: allow full nohz CPU accounting (diff) | |
| download | linux-19f29887a73e32c52171f2725ac2d7561adab62b.tar.xz linux-19f29887a73e32c52171f2725ac2d7561adab62b.zip | |
Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into timers/core
Merge updated full dynticks support from Frederic Weisbecker:
- support 32-bit systems (full dynticks was 64-bit only before)
- support ARM
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig index 2b62fe86f9ec..3ce6e8c5f3fc 100644 --- a/kernel/time/Kconfig +++ b/kernel/time/Kconfig @@ -100,7 +100,7 @@ config NO_HZ_FULL # RCU_USER_QS dependency depends on HAVE_CONTEXT_TRACKING # VIRT_CPU_ACCOUNTING_GEN dependency - depends on 64BIT + depends on HAVE_VIRT_CPU_ACCOUNTING_GEN select NO_HZ_COMMON select RCU_USER_QS select RCU_NOCB_CPU |