diff --git a/[refs] b/[refs]
index 663722533899..dbcda64050bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfbf4a1bc319f0f9a31e39b2da1fa5c55e85af89
+refs/heads/master: a5574cf65b5f03ce9ade3918764fe22e5e2371e3
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 845ea2b2d487..bbcafaa160c0 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -18,6 +18,7 @@ config X86_64
 ### Arch settings
 config X86
 	def_bool y
+	select HAVE_UNSTABLE_SCHED_CLOCK
 	select HAVE_IDE
 	select HAVE_OPROFILE
 	select HAVE_KPROBES
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index f0e62e5ce0dc..fa42e6b549d3 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -316,6 +316,12 @@ config CPUSETS
 
 	  Say N if unsure.
 
+#
+# Architectures with an unreliable sched_clock() should select this:
+#
+config HAVE_UNSTABLE_SCHED_CLOCK
+	bool
+
 config GROUP_SCHED
 	bool "Group CPU scheduler"
 	default y