[Devel] [PATCH RHEL7 COMMIT] ve/sched: cpu_cgroup_get_stat() declaration in !CONFIG_VZ_FAIRSCHED case

[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 26d7aef283252ea60ce7debfd8b8806867efdf7a
Author: Kir Kolyshkin <kir at openvz.org>
Date:   Thu May 7 20:28:06 2015 +0400

    ve/sched: cpu_cgroup_get_stat() declaration in !CONFIG_VZ_FAIRSCHED case
    
    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.
    
    =============================================================
    
    Function cpu_cgroup_get_stat() is needed by proc/uptime.c
    even if !CONFIG_VZ_FAIRSCHED case.
    
    This fixes the following compilation problem:
    
      CC      fs/proc/uptime.o
    fs/proc/uptime.c: In function ‘get_veX_idle’:
    fs/proc/uptime.c:32:2: error: implicit declaration of function
    ‘cpu_cgroup_get_stat’ [-Werror=implicit-function-declaration]
      cpu_cgroup_get_stat(cgrp, &kstat);
      ^
    cc1: some warnings being treated as errors
    
    Signed-off-by: Kir Kolyshkin <kir at openvz.org>
---
 include/linux/fairsched.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/linux/fairsched.h b/include/linux/fairsched.h
index c89cb86..c944bed 100644
--- a/include/linux/fairsched.h
+++ b/include/linux/fairsched.h
@@ -53,8 +53,6 @@ int fairsched_new_node(int id, unsigned int vcpus);
 int fairsched_move_task(int id, struct task_struct *tsk);
 void fairsched_drop_node(int id, int leave);
 
-struct kernel_cpustat;
-void cpu_cgroup_get_stat(struct cgroup *cgrp, struct kernel_cpustat *kstat);
 int fairsched_get_cpu_stat(int id, struct kernel_cpustat *kstat);
 
 int cpu_cgroup_get_avenrun(struct cgroup *cgrp, unsigned long *avenrun);
@@ -75,6 +73,10 @@ static inline int fairsched_get_cpu_avenrun(int id, unsigned long *avenrun) { re
 static inline int fairsched_get_cpu_stat(int id, struct kernel_cpustat *kstat) { return -ENOSYS; }
 
 #endif /* CONFIG_VZ_FAIRSCHED */
+
+struct kernel_cpustat;
+void cpu_cgroup_get_stat(struct cgroup *cgrp, struct kernel_cpustat *kstat);
+
 #endif /* __KERNEL__ */
 
 #endif /* __LINUX_FAIRSCHED_H__ */