diff --git a/[refs] b/[refs] index 2817154bcfb0..8efdb6e7cf32 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 535c0c34698061544f81a51c65fc51f4eeeebff6 +refs/heads/master: fa574a48a1e9706bba38188d3bf61ecb66546a77 diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 2f925ccb3e5b..1d14cc6b79ad 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -82,7 +82,6 @@ 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)