You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
80 lines
2.2 KiB
Diff
80 lines
2.2 KiB
Diff
From d4de8d2873994b22855d57ccdc21b52d2c7bbd7b Mon Sep 17 00:00:00 2001
|
|
From: P33M <p33m@github.com>
|
|
Date: Wed, 24 Apr 2019 14:25:41 +0100
|
|
Subject: [PATCH 428/806] Revert "defconfigs: disable memory and IO cgroups
|
|
(#2908)"
|
|
|
|
This reverts commit 9881cdbf446081f71c62f39f4c56a21001baea73.
|
|
---
|
|
arch/arm/configs/bcm2709_defconfig | 4 ++++
|
|
arch/arm/configs/bcmrpi_defconfig | 4 ++++
|
|
arch/arm64/configs/bcmrpi3_defconfig | 4 ++++
|
|
3 files changed, 12 insertions(+)
|
|
|
|
--- a/arch/arm/configs/bcm2709_defconfig
|
|
+++ b/arch/arm/configs/bcm2709_defconfig
|
|
@@ -14,6 +14,8 @@ CONFIG_TASK_XACCT=y
|
|
CONFIG_TASK_IO_ACCOUNTING=y
|
|
CONFIG_IKCONFIG=m
|
|
CONFIG_IKCONFIG_PROC=y
|
|
+CONFIG_MEMCG=y
|
|
+CONFIG_BLK_CGROUP=y
|
|
CONFIG_CGROUP_FREEZER=y
|
|
CONFIG_CPUSETS=y
|
|
CONFIG_CGROUP_DEVICE=y
|
|
@@ -62,8 +64,10 @@ CONFIG_MODULES=y
|
|
CONFIG_MODULE_UNLOAD=y
|
|
CONFIG_MODVERSIONS=y
|
|
CONFIG_MODULE_SRCVERSION_ALL=y
|
|
+CONFIG_BLK_DEV_THROTTLING=y
|
|
CONFIG_PARTITION_ADVANCED=y
|
|
CONFIG_MAC_PARTITION=y
|
|
+CONFIG_CFQ_GROUP_IOSCHED=y
|
|
CONFIG_BINFMT_MISC=m
|
|
CONFIG_CLEANCACHE=y
|
|
CONFIG_FRONTSWAP=y
|
|
--- a/arch/arm/configs/bcmrpi_defconfig
|
|
+++ b/arch/arm/configs/bcmrpi_defconfig
|
|
@@ -13,6 +13,8 @@ CONFIG_TASK_XACCT=y
|
|
CONFIG_TASK_IO_ACCOUNTING=y
|
|
CONFIG_IKCONFIG=m
|
|
CONFIG_IKCONFIG_PROC=y
|
|
+CONFIG_MEMCG=y
|
|
+CONFIG_BLK_CGROUP=y
|
|
CONFIG_CGROUP_FREEZER=y
|
|
CONFIG_CGROUP_DEVICE=y
|
|
CONFIG_CGROUP_CPUACCT=y
|
|
@@ -56,8 +58,10 @@ CONFIG_MODULES=y
|
|
CONFIG_MODULE_UNLOAD=y
|
|
CONFIG_MODVERSIONS=y
|
|
CONFIG_MODULE_SRCVERSION_ALL=y
|
|
+CONFIG_BLK_DEV_THROTTLING=y
|
|
CONFIG_PARTITION_ADVANCED=y
|
|
CONFIG_MAC_PARTITION=y
|
|
+CONFIG_CFQ_GROUP_IOSCHED=y
|
|
CONFIG_BINFMT_MISC=m
|
|
CONFIG_CLEANCACHE=y
|
|
CONFIG_FRONTSWAP=y
|
|
--- a/arch/arm64/configs/bcmrpi3_defconfig
|
|
+++ b/arch/arm64/configs/bcmrpi3_defconfig
|
|
@@ -13,6 +13,8 @@ CONFIG_TASK_XACCT=y
|
|
CONFIG_TASK_IO_ACCOUNTING=y
|
|
CONFIG_IKCONFIG=m
|
|
CONFIG_IKCONFIG_PROC=y
|
|
+CONFIG_MEMCG=y
|
|
+CONFIG_BLK_CGROUP=y
|
|
CONFIG_CGROUP_FREEZER=y
|
|
CONFIG_CPUSETS=y
|
|
CONFIG_CGROUP_DEVICE=y
|
|
@@ -60,8 +62,10 @@ CONFIG_MODULES=y
|
|
CONFIG_MODULE_UNLOAD=y
|
|
CONFIG_MODVERSIONS=y
|
|
CONFIG_MODULE_SRCVERSION_ALL=y
|
|
+CONFIG_BLK_DEV_THROTTLING=y
|
|
CONFIG_PARTITION_ADVANCED=y
|
|
CONFIG_MAC_PARTITION=y
|
|
+CONFIG_CFQ_GROUP_IOSCHED=y
|
|
CONFIG_BINFMT_MISC=y
|
|
CONFIG_CLEANCACHE=y
|
|
CONFIG_FRONTSWAP=y
|