diff --git a/[refs] b/[refs] index fb0e0597e191..e3d11951cf50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05ad717c77b1b8e98a1dd768c3700036d634629e +refs/heads/master: e90c83f757fffdacec8b3c5eee5617dcc038338f diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 46c3bff3ced2..a4135b5e562e 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -108,6 +108,7 @@ config X86 select GENERIC_STRNLEN_USER select HAVE_RCU_USER_QS if X86_64 select HAVE_IRQ_TIME_ACCOUNTING + select HAS_PERSISTENT_CLOCK select GENERIC_KERNEL_THREAD select GENERIC_KERNEL_EXECVE select MODULES_USE_ELF_REL if X86_32