--- zzzz-none-000/linux-3.10.107/mm/memory.c	2017-06-27 09:49:32.000000000 +0000
+++ vr9-7490-729/linux-3.10.107/mm/memory.c	2021-11-10 11:53:56.000000000 +0000
@@ -3836,11 +3836,14 @@
 	 * Enable the memcg OOM handling for faults triggered in user
 	 * space.  Kernel faults are handled more gracefully.
 	 */
+#ifdef CONFIG_MEMCG
 	if (flags & FAULT_FLAG_USER)
 		mem_cgroup_oom_enable();
+#endif /*--- #ifdef CONFIG_MEMCG ---*/
 
 	ret = __handle_mm_fault(mm, vma, address, flags);
 
+#ifdef CONFIG_MEMCG
 	if (flags & FAULT_FLAG_USER) {
 		mem_cgroup_oom_disable();
                 /*
@@ -3851,7 +3854,9 @@
                  */
                 if (task_in_memcg_oom(current) && !(ret & VM_FAULT_OOM))
                         mem_cgroup_oom_synchronize(false);
+                task_in_memcg_oom(current);
 	}
+#endif /*--- #ifdef CONFIG_MEMCG ---*/
 
 	return ret;
 }