diff options
| author | Tejun Heo <tj@kernel.org> | 2013-06-13 19:38:26 -0700 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2013-06-13 19:42:22 -0700 |
| commit | 2b0e53a7c8a6972755c0f0152d7fad2289fdc5eb (patch) | |
| tree | bf427cbe4b9d85cd5651b01f2f18668e8d12ed45 /kernel/time/Kconfig | |
| parent | ea15f8ccdb430af1e8bc9b4e19a230eb4c356777 (diff) | |
| parent | dbece3a0f1ef0b19aff1cc6ed0942fec9ab98de1 (diff) | |
Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu into for-3.11
This is to receive percpu_refcount which will replace atomic_t
reference count in cgroup_subsys_state.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/time/Kconfig')
| -rw-r--r-- | kernel/time/Kconfig | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig index e4c07b0692b..70f27e89012 100644 --- a/kernel/time/Kconfig +++ b/kernel/time/Kconfig @@ -12,11 +12,6 @@ config CLOCKSOURCE_WATCHDOG config ARCH_CLOCKSOURCE_DATA bool -# Platforms has a persistent clock -config ALWAYS_USE_PERSISTENT_CLOCK - bool - default n - # Timekeeping vsyscall support config GENERIC_TIME_VSYSCALL bool |