1 files changed, 11 insertions, 1 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 87717f3687d2..45161b816313 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -40,6 +40,7 @@ config X86
         select HAVE_GENERIC_DMA_COHERENT if X86_32
         select HAVE_EFFICIENT_UNALIGNED_ACCESS
         select USER_STACKTRACE_SUPPORT
+        select HAVE_DMA_API_DEBUG
         select HAVE_KERNEL_GZIP
         select HAVE_KERNEL_BZIP2
         select HAVE_KERNEL_LZMA
@@ -169,6 +170,9 @@ config GENERIC_HARDIRQS
         bool
         default y
 
+config GENERIC_HARDIRQS_NO__DO_IRQ
+       def_bool y
+
 config GENERIC_IRQ_PROBE
         bool
         default y
@@ -931,6 +935,12 @@ config X86_CPUID
           with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
           /dev/cpu/31/cpuid.
 
+config X86_CPU_DEBUG
+        tristate "/sys/kernel/debug/x86/cpu/* - CPU Debug support"
+        ---help---
+          If you select this option, this will provide various x86 CPUs
+          information through debugfs.
+
 choice
         prompt "High Memory Support"
         default HIGHMEM4G if !X86_NUMAQ
@@ -1123,7 +1133,7 @@ config NUMA_EMU
 
 config NODES_SHIFT
         int "Maximum NUMA Nodes (as a power of 2)" if !MAXSMP
-        range 1 9   if X86_64
+        range 1 9
         default "9" if MAXSMP
         default "6" if X86_64
         default "4" if X86_NUMAQ