Merge branch 'x86/extable'

diff --cc arch/x86/Kconfig
index 1c9ac7d9e0273ed87ea2096422cd0f893f815083,2f925ccb3e5bf7751fa9d767cf63e1d5e15d2c5f..83db6b9af17453d2177a58037fdf54bfbb9b37f2
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -83,9 -82,10 +83,10 @@@ config X8
        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)
 +      def_bool (KPROBES || PERF_EVENTS || UPROBES)
  
  config OUTPUT_FORMAT
        string