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 48645523b66c6e45463a2d9e721babf7d8c52520 Author: Kir Kolyshkin <k...@openvz.org> Date: Thu May 7 20:28:39 2015 +0400
bc/ioprio: ub_set_ioprio() declaration if !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 this: CC fs/ioprio.o fs/ioprio.c: In function âSYSC_ioprio_setâ: fs/ioprio.c:162:4: error: implicit declaration of function âub_set_ioprioâ [-Werror=implicit-function-declaration] ret = ub_set_ioprio(who, data); ^ Signed-off-by: Kir Kolyshkin <k...@openvz.org> --- include/bc/beancounter.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/include/bc/beancounter.h b/include/bc/beancounter.h index f332de9..31671ff4 100644 --- a/include/bc/beancounter.h +++ b/include/bc/beancounter.h @@ -541,15 +541,16 @@ void ub_reclaim_rate_limit(struct user_beancounter *ub, int wait, unsigned count #define UB_IOPRIO_MIN 0 #define UB_IOPRIO_MAX 8 -#ifdef CONFIG_BC_IO_PRIORITY -extern int ub_set_ioprio(int id, int ioprio); -#else -static inline int ub_set_ioprio(int veid, int ioprio) { return -EINVAL; } -#endif extern void ub_init_ioprio(struct user_beancounter *ub); extern void ub_fini_ioprio(struct user_beancounter *ub); #endif /* CONFIG_BEANCOUNTERS */ +#ifdef CONFIG_BC_IO_PRIORITY +extern int ub_set_ioprio(int id, int ioprio); +#else +static inline int ub_set_ioprio(int veid, int ioprio) { return -EINVAL; } +#endif + #endif /* _LINUX_BEANCOUNTER_H */
_______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel