From 27d7b135d4475b8c7b5159792b9b6d160e4535c1 Mon Sep 17 00:00:00 2001 From: Qiang Huang Date: Mon, 16 May 2016 13:55:24 +0800 Subject: [PATCH] Update check_config for MEMCG_KMEM CONFIG_MEMCG_KMEM is removed since 4.6, it's accounted by default since 4.6, so it's merged to CONFIG_MEMCG. Signed-off-by: Qiang Huang --- contrib/check-config.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/check-config.sh b/contrib/check-config.sh index 80de074c37..bdfda0ca0d 100755 --- a/contrib/check-config.sh +++ b/contrib/check-config.sh @@ -206,12 +206,16 @@ echo 'Optional Features:' check_flags CGROUP_PIDS } { - check_flags MEMCG_KMEM MEMCG_SWAP MEMCG_SWAP_ENABLED + check_flags MEMCG_SWAP MEMCG_SWAP_ENABLED if is_set MEMCG_SWAP && ! is_set MEMCG_SWAP_ENABLED; then echo " $(wrap_color '(note that cgroup swap accounting is not enabled in your kernel config, you can enable it by setting boot option "swapaccount=1")' bold black)" fi } +if [ "$kernelMajor" -lt 4 ] || [ "$kernelMajor" -eq 4 -a "$kernelMinor" -le 5 ]; then + check_flags MEMCG_KMEM +fi + if [ "$kernelMajor" -lt 3 ] || [ "$kernelMajor" -eq 3 -a "$kernelMinor" -le 18 ]; then check_flags RESOURCE_COUNTERS fi