git.openwrt.org Git - openwrt/staging/jow.git/blob

   1 From 0da089c51f77b499f9e0fae5f7626b554e2a297f Mon Sep 17 00:00:00 2001
   2 From: P33M <p33m@github.com>
   3 Date: Wed, 24 Apr 2019 14:25:41 +0100
   4 Subject: [PATCH 428/782] Revert "defconfigs: disable memory and IO cgroups
   5  (#2908)"
   6
   7 This reverts commit 9881cdbf446081f71c62f39f4c56a21001baea73.
   8 ---
   9  arch/arm/configs/bcm2709_defconfig   | 4 ++++
  10  arch/arm/configs/bcmrpi_defconfig    | 4 ++++
  11  arch/arm64/configs/bcmrpi3_defconfig | 4 ++++
  12  3 files changed, 12 insertions(+)
  13
  14 --- a/arch/arm/configs/bcm2709_defconfig
  15 +++ b/arch/arm/configs/bcm2709_defconfig
  16 @@ -14,6 +14,8 @@ CONFIG_TASK_XACCT=y
  17  CONFIG_TASK_IO_ACCOUNTING=y
  18  CONFIG_IKCONFIG=m
  19  CONFIG_IKCONFIG_PROC=y
  20 +CONFIG_MEMCG=y
  21 +CONFIG_BLK_CGROUP=y
  22  CONFIG_CGROUP_FREEZER=y
  23  CONFIG_CPUSETS=y
  24  CONFIG_CGROUP_DEVICE=y
  25 @@ -62,8 +64,10 @@ CONFIG_MODULES=y
  26  CONFIG_MODULE_UNLOAD=y
  27  CONFIG_MODVERSIONS=y
  28  CONFIG_MODULE_SRCVERSION_ALL=y
  29 +CONFIG_BLK_DEV_THROTTLING=y
  30  CONFIG_PARTITION_ADVANCED=y
  31  CONFIG_MAC_PARTITION=y
  32 +CONFIG_CFQ_GROUP_IOSCHED=y
  33  CONFIG_BINFMT_MISC=m
  34  CONFIG_CLEANCACHE=y
  35  CONFIG_FRONTSWAP=y
  36 --- a/arch/arm/configs/bcmrpi_defconfig
  37 +++ b/arch/arm/configs/bcmrpi_defconfig
  38 @@ -13,6 +13,8 @@ CONFIG_TASK_XACCT=y
  39  CONFIG_TASK_IO_ACCOUNTING=y
  40  CONFIG_IKCONFIG=m
  41  CONFIG_IKCONFIG_PROC=y
  42 +CONFIG_MEMCG=y
  43 +CONFIG_BLK_CGROUP=y
  44  CONFIG_CGROUP_FREEZER=y
  45  CONFIG_CGROUP_DEVICE=y
  46  CONFIG_CGROUP_CPUACCT=y
  47 @@ -56,8 +58,10 @@ CONFIG_MODULES=y
  48  CONFIG_MODULE_UNLOAD=y
  49  CONFIG_MODVERSIONS=y
  50  CONFIG_MODULE_SRCVERSION_ALL=y
  51 +CONFIG_BLK_DEV_THROTTLING=y
  52  CONFIG_PARTITION_ADVANCED=y
  53  CONFIG_MAC_PARTITION=y
  54 +CONFIG_CFQ_GROUP_IOSCHED=y
  55  CONFIG_BINFMT_MISC=m
  56  CONFIG_CLEANCACHE=y
  57  CONFIG_FRONTSWAP=y
  58 --- a/arch/arm64/configs/bcmrpi3_defconfig
  59 +++ b/arch/arm64/configs/bcmrpi3_defconfig
  60 @@ -13,6 +13,8 @@ CONFIG_TASK_XACCT=y
  61  CONFIG_TASK_IO_ACCOUNTING=y
  62  CONFIG_IKCONFIG=m
  63  CONFIG_IKCONFIG_PROC=y
  64 +CONFIG_MEMCG=y
  65 +CONFIG_BLK_CGROUP=y
  66  CONFIG_CGROUP_FREEZER=y
  67  CONFIG_CPUSETS=y
  68  CONFIG_CGROUP_DEVICE=y
  69 @@ -60,8 +62,10 @@ CONFIG_MODULES=y
  70  CONFIG_MODULE_UNLOAD=y
  71  CONFIG_MODVERSIONS=y
  72  CONFIG_MODULE_SRCVERSION_ALL=y
  73 +CONFIG_BLK_DEV_THROTTLING=y
  74  CONFIG_PARTITION_ADVANCED=y
  75  CONFIG_MAC_PARTITION=y
  76 +CONFIG_CFQ_GROUP_IOSCHED=y
  77  CONFIG_BINFMT_MISC=y
  78  CONFIG_CLEANCACHE=y
  79  CONFIG_FRONTSWAP=y