[Devel] [PATCH RHEL7 COMMIT] vzstat: KSTAT_PERF_ENTER redefinition fixed when !CONFIG_VE

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

    vzstat: KSTAT_PERF_ENTER redefinition fixed when !CONFIG_VE
    
    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.
    
    =============================================================
    
    This is a fix to commit df6cdba, fixing the following warning:
    
    	In file included from include/linux/ve.h:18:0,
    			 from init/main.c:78:
    	include/linux/vzstat.h:120:0: warning: "KSTAT_PERF_ENTER" redefined
    	[enabled by default]
    	 #define KSTAT_PERF_ENTER(name)
    	 ^
    	include/linux/vzstat.h:119:0: note: this is the location of the previous
    	definition
    	 #define KSTAT_PERF_ENTER(ptr, real_time, cpu_time)
    	 ^
    
    Signed-off-by: Kir Kolyshkin <kir at openvz.org>
---
 include/linux/vzstat.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/vzstat.h b/include/linux/vzstat.h
index 0931b76..26f24f7 100644
--- a/include/linux/vzstat.h
+++ b/include/linux/vzstat.h
@@ -116,7 +116,7 @@ extern void KSTAT_LAT_UPDATE(struct kstat_lat_struct *p);
 extern void KSTAT_LAT_PCPU_UPDATE(struct kstat_lat_pcpu_struct *p);
 
 #else
-#define KSTAT_PERF_ENTER(ptr, real_time, cpu_time)
+#define KSTAT_PERF_ADD(ptr, real_time, cpu_time)
 #define KSTAT_PERF_ENTER(name)
 #define KSTAT_PERF_LEAVE(name)
 #define KSTAT_LAT_ADD(p, dur)