summaryrefslogtreecommitdiffstats
path: root/config-x86-generic
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2016-05-16 15:50:03 -0700
committerLaura Abbott <labbott@fedoraproject.org>2016-05-16 15:50:03 -0700
commitc3b50ba0e0c85eb5eee49ceae99d401183243fc3 (patch)
treed60a616514d5817479922aa8920178708735cec0 /config-x86-generic
parent9b3b59db20e9c1f9585edf2c435cafd06ad8e6c8 (diff)
downloadkernel-c3b50ba0e0c85eb5eee49ceae99d401183243fc3.tar.gz
kernel-c3b50ba0e0c85eb5eee49ceae99d401183243fc3.tar.xz
kernel-c3b50ba0e0c85eb5eee49ceae99d401183243fc3.zip
Linux v4.6-153-g3469d26
- Reenable debugging options. - locking, efi, signals, rcu merges
Diffstat (limited to 'config-x86-generic')
-rw-r--r--config-x86-generic4
1 files changed, 3 insertions, 1 deletions
diff --git a/config-x86-generic b/config-x86-generic
index 06ddcd1a0..e2e52e40c 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -48,6 +48,8 @@ CONFIG_FB_EFI=y
CONFIG_EARLY_PRINTK_EFI=y
CONFIG_EFI_RUNTIME_MAP=y
# CONFIG_EFI_FAKE_MEMMAP is not set
+# CONFIG_EFI_BOOTLOADER_CONTROL is not set
+# CONFIG_EFI_CAPSULE_LOADER is not set
# needs FB_SIMPLE to work correctly
# CONFIG_X86_SYSFB is not set
@@ -374,7 +376,7 @@ CONFIG_SP5100_TCO=m
# CONFIG_MEMTEST is not set
# CONFIG_DEBUG_TLBFLUSH is not set
-# CONFIG_MAXSMP is not set
+CONFIG_MAXSMP=y
CONFIG_HP_ILO=m