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 <h.huangqiang@huawei.com>
| ... | ... |
@@ -206,12 +206,16 @@ echo 'Optional Features:' |
| 206 | 206 |
check_flags CGROUP_PIDS |
| 207 | 207 |
} |
| 208 | 208 |
{
|
| 209 |
- check_flags MEMCG_KMEM MEMCG_SWAP MEMCG_SWAP_ENABLED |
|
| 209 |
+ check_flags MEMCG_SWAP MEMCG_SWAP_ENABLED |
|
| 210 | 210 |
if is_set MEMCG_SWAP && ! is_set MEMCG_SWAP_ENABLED; then |
| 211 | 211 |
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)" |
| 212 | 212 |
fi |
| 213 | 213 |
} |
| 214 | 214 |
|
| 215 |
+if [ "$kernelMajor" -lt 4 ] || [ "$kernelMajor" -eq 4 -a "$kernelMinor" -le 5 ]; then |
|
| 216 |
+ check_flags MEMCG_KMEM |
|
| 217 |
+fi |
|
| 218 |
+ |
|
| 215 | 219 |
if [ "$kernelMajor" -lt 3 ] || [ "$kernelMajor" -eq 3 -a "$kernelMinor" -le 18 ]; then |
| 216 | 220 |
check_flags RESOURCE_COUNTERS |
| 217 | 221 |
fi |