[Devel] [PATCH RHEL7 COMMIT] bc/mm/oom: put UB_OOM_MANUAL_SCORE_ADJ bit check under CONFIG_BEANCOUNTERS

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-123.1.2.vz7.4.10
------>
commit a1fe3b80fa701fa9e4894f735f3dfb49337e2d24
Author: Kir Kolyshkin <kir at openvz.org>
Date:   Thu May 7 20:28:13 2015 +0400

    bc/mm/oom: put UB_OOM_MANUAL_SCORE_ADJ bit check under CONFIG_BEANCOUNTERS
    
    This was found while tring to compile the kernel with a stock
    config (i.e. no CONFIG_BEANCOUNTERS, CONFIG_VE etc.) and
    boot it on IBM Power8.
    
    =============================================================
    
    Signed-off-by: Kir Kolyshkin <kir at openvz.org>
---
 mm/oom_group.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mm/oom_group.c b/mm/oom_group.c
index 206ba06..2401eed 100644
--- a/mm/oom_group.c
+++ b/mm/oom_group.c
@@ -60,8 +60,10 @@ int get_task_oom_score_adj(struct task_struct *t)
 	uid_t task_uid;
 	int adj = 0;
 
+#ifdef CONFIG_BEANCOUNTERS
 	if (test_bit(UB_OOM_MANUAL_SCORE_ADJ, &get_task_ub(t)->ub_flags))
 		return t->signal->oom_score_adj;
+#endif
 
 	rcu_read_lock();
 	cred = __task_cred(t);