aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig10
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index bd3c2c53873e..5b9b12321ad1 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -26,6 +26,7 @@ config X86
26 select HAVE_KPROBES 26 select HAVE_KPROBES
27 select ARCH_WANT_OPTIONAL_GPIOLIB 27 select ARCH_WANT_OPTIONAL_GPIOLIB
28 select HAVE_KRETPROBES 28 select HAVE_KRETPROBES
29 select HAVE_FTRACE_MCOUNT_RECORD
29 select HAVE_DYNAMIC_FTRACE 30 select HAVE_DYNAMIC_FTRACE
30 select HAVE_FTRACE 31 select HAVE_FTRACE
31 select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) 32 select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
@@ -193,6 +194,7 @@ config X86_TRAMPOLINE
193config KTIME_SCALAR 194config KTIME_SCALAR
194 def_bool X86_32 195 def_bool X86_32
195source "init/Kconfig" 196source "init/Kconfig"
197source "kernel/Kconfig.freezer"
196 198
197menu "Processor type and features" 199menu "Processor type and features"
198 200
@@ -1241,14 +1243,6 @@ config EFI
1241 resultant kernel should continue to boot on existing non-EFI 1243 resultant kernel should continue to boot on existing non-EFI
1242 platforms. 1244 platforms.
1243 1245
1244config IRQBALANCE
1245 def_bool y
1246 prompt "Enable kernel irq balancing"
1247 depends on X86_32 && SMP && X86_IO_APIC
1248 help
1249 The default yes will allow the kernel to do irq load balancing.
1250 Saying no will keep the kernel from doing irq load balancing.
1251
1252config SECCOMP 1246config SECCOMP
1253 def_bool y 1247 def_bool y
1254 prompt "Enable seccomp to safely compute untrusted bytecode" 1248 prompt "Enable seccomp to safely compute untrusted bytecode"