summaryrefslogtreecommitdiff
path: root/kernels/linux-libre-pae/config
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-05-10 22:08:20 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-05-10 22:10:14 -0300
commit5e8f562e362c8018366dbd95035d2ea009b7159f (patch)
treee64092f2f932ae3e4eeb96ac8a17447b940a2eb3 /kernels/linux-libre-pae/config
parent310e060e24af6e1bacc11312c477ad67a13a0818 (diff)
linux-libre-{pae,xen}-4.0.2_gnu-1: updating version
* reenable CONFIG_MEMCG_KMEM
Diffstat (limited to 'kernels/linux-libre-pae/config')
-rw-r--r--kernels/linux-libre-pae/config6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config
index dd74bce6d..088355187 100644
--- a/kernels/linux-libre-pae/config
+++ b/kernels/linux-libre-pae/config
@@ -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
@@ -5776,7 +5776,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