[Devel] [PATCH RHEL7 COMMIT] ub/kernel: use get_task_ub() - fix compile for !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 6137f0c46cd91112c4ac312be969732d5ff6fec9
Author: Kir Kolyshkin <k...@openvz.org>
Date:   Thu May 7 20:28:19 2015 +0400

    ub/kernel: use get_task_ub() - fix compile for !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.
    
    =============================================================
    
    Fix the following compilation warning if CONFIG_BEANCOUNTERS is not set:
    
      CC      kernel/exit.o
    kernel/exit.c: In function ‘release_task’:
    kernel/exit.c:215:20: error: ‘struct task_struct’ has no member named
    ‘task_bc’
      ub_task_uncharge(p->task_bc.task_ub);
                       ^
    
    Signed-off-by: Kir Kolyshkin <k...@openvz.org>
---
 kernel/exit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/exit.c b/kernel/exit.c
index 56b840c..1c65d95 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -211,7 +211,7 @@ repeat:
 
        write_unlock_irq(&tasklist_lock);
        release_thread(p);
-       ub_task_uncharge(p->task_bc.task_ub);
+       ub_task_uncharge(get_task_ub(p));
        call_rcu(&p->rcu, delayed_put_task_struct);
 
        p = leader;

_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel