summaryrefslogtreecommitdiff
path: root/libre/linux-libre/config.i686
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-05-09 11:43:40 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-05-09 11:43:40 -0300
commit55a48004dd3e6ec98df57254cf3be4b4a7dba38b (patch)
tree1f3279ba68553fdbff3494823c041fbad4da96df /libre/linux-libre/config.i686
parente45fbbf93a20bbae0a421bc87e04b7428321ba1f (diff)
downloadabslibre-55a48004dd3e6ec98df57254cf3be4b4a7dba38b.tar.gz
abslibre-55a48004dd3e6ec98df57254cf3be4b4a7dba38b.tar.bz2
abslibre-55a48004dd3e6ec98df57254cf3be4b4a7dba38b.zip
linux-libre-4.0.2_gnu-1: updating version
* reenable CONFIG_MEMCG_KMEM
Diffstat (limited to 'libre/linux-libre/config.i686')
-rw-r--r--libre/linux-libre/config.i6866
1 files changed, 3 insertions, 3 deletions
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 0219f13de..0754e396b 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -151,8 +151,8 @@ CONFIG_CGROUP_CPUACCT=y
CONFIG_PAGE_COUNTER=y
CONFIG_MEMCG=y
CONFIG_MEMCG_SWAP=y
-# CONFIG_MEMCG_SWAP_ENABLED is not set
-# CONFIG_MEMCG_KMEM is not set
+CONFIG_MEMCG_SWAP_ENABLED=y
+CONFIG_MEMCG_KMEM=y
# CONFIG_CGROUP_HUGETLB is not set
# CONFIG_CGROUP_PERF is not set
CONFIG_CGROUP_SCHED=y
@@ -5770,7 +5770,7 @@ CONFIG_VIRTIO=m
# Virtio drivers
#
CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_PCI_LEGACY=y
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_MMIO=m
CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y