diff --git a/[refs] b/[refs]
index 1016f7351af7..7bc1d8373ea7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b0544955a7b7fd363ac8fa709b70c8e7c3cfbea
+refs/heads/master: d405c60128a1973648058fa950a8960ec1f27e38
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 1d14cc6b79ad..2f925ccb3e5b 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -82,6 +82,7 @@ config X86
 	select ARCH_HAVE_NMI_SAFE_CMPXCHG
 	select GENERIC_IOMAP
 	select DCACHE_WORD_ACCESS if !DEBUG_PAGEALLOC
+	select BUILDTIME_EXTABLE_SORT
 
 config INSTRUCTION_DECODER
 	def_bool (KPROBES || PERF_EVENTS)