[Devel] [PATCH RHEL7 COMMIT] bc/dcache: add parameter names to ub_dcache_reclaim() declaration 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 fcf188d71141445bda8dc60d2d3d614dfb2cf6d9
Author: Kir Kolyshkin <k...@openvz.org>
Date:   Thu May 7 20:28:09 2015 +0400

    bc/dcache: add parameter names to ub_dcache_reclaim() declaration 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.
    
    =============================================================
    
    In case CONFIG_BEANCOUNTERS is not defined, UB_DECLARE_VOID_FUNC
    macro is expanded into static inline function (rather than a
    function declaration), which requires parameter names.
    
        Fixes the following error:
          CC      kernel/ve/vecalls.o
        In file included from include/bc/dcache.h:4:0,
                         from kernel/ve/vecalls.c:78:
        include/bc/dcache.h: In function ‘ub_dcache_reclaim’:
        include/bc/dcache.h:15:47: error: parameter name omitted
         UB_DECLARE_VOID_FUNC(ub_dcache_reclaim(struct user_beancounter *ub, 
unsigned long, unsigned long))
                                                       ^
        include/bc/decl.h:34:21: note: in definition of macro 
‘UB_DECLARE_VOID_FUNC’
          static inline void decl   \
                             ^
        include/bc/dcache.h:15:47: error: parameter name omitted
         UB_DECLARE_VOID_FUNC(ub_dcache_reclaim(struct user_beancounter *ub, 
unsigned long, unsigned long))
                                                       ^
        include/bc/decl.h:34:21: note: in definition of macro 
‘UB_DECLARE_VOID_FUNC’
          static inline void decl   \
                             ^
    
    Signed-off-by: Kir Kolyshkin <k...@openvz.org>
---
 include/bc/dcache.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/bc/dcache.h b/include/bc/dcache.h
index e2b2c9a..186e0fc 100644
--- a/include/bc/dcache.h
+++ b/include/bc/dcache.h
@@ -11,7 +11,7 @@ UB_DECLARE_VOID_FUNC(ub_dcache_set_owner(struct dentry *d, 
struct user_beancount
 UB_DECLARE_VOID_FUNC(ub_dcache_change_owner(struct dentry *dentry, struct 
user_beancounter *ub))
 UB_DECLARE_VOID_FUNC(ub_dcache_clear_owner(struct dentry *dentry))
 UB_DECLARE_VOID_FUNC(ub_dcache_unuse(struct user_beancounter *ub))
-UB_DECLARE_VOID_FUNC(ub_dcache_reclaim(struct user_beancounter *ub, unsigned 
long, unsigned long))
+UB_DECLARE_VOID_FUNC(ub_dcache_reclaim(struct user_beancounter *ub, unsigned 
long numerator, unsigned long denominator))
 UB_DECLARE_FUNC(int, ub_dcache_shrink(struct user_beancounter *ub, unsigned 
long size, gfp_t gfp_mask))
 UB_DECLARE_FUNC(unsigned long, ub_dcache_get_size(struct dentry *dentry))
 

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