summaryrefslogtreecommitdiffstats
path: root/arch/x86/configs/x86_64_defconfig
diff options
context:
space:
mode:
authorKonstantin Khlebnikov <koct9i@gmail.com>2016-05-24 01:24:34 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-24 02:04:14 +0200
commit7efb2a7b85f2d2a53ae50e35cf5df260dd5278b7 (patch)
tree567a717cb042dcd17dba8b943e910bd3795dee30 /arch/x86/configs/x86_64_defconfig
parentdrivers/memstick/core/mspro_block: use kmemdup (diff)
downloadlinux-7efb2a7b85f2d2a53ae50e35cf5df260dd5278b7.tar.xz
linux-7efb2a7b85f2d2a53ae50e35cf5df260dd5278b7.zip
arch/defconfig: remove CONFIG_RESOURCE_COUNTERS
This option was replaced by PAGE_COUNTER which is selected by MEMCG. Signed-off-by: Konstantin Khlebnikov <koct9i@gmail.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Balbir Singh <bsingharora@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/configs/x86_64_defconfig')
-rw-r--r--arch/x86/configs/x86_64_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig
index 0c8d7963483c..d28bdabcc87e 100644
--- a/arch/x86/configs/x86_64_defconfig
+++ b/arch/x86/configs/x86_64_defconfig
@@ -16,7 +16,6 @@ CONFIG_CGROUPS=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CPUSETS=y
CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_SCHED=y
CONFIG_BLK_DEV_INITRD=y
# CONFIG_COMPAT_BRK is not set