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 ad7f5ed73d43314f612d647fb60a56d1562ce773
Author: Kir Kolyshkin <k...@openvz.org>
Date: Thu May 7 20:28:07 2015 +0400
bc/io_acct: define get_io_ub() for !CONFIG_BC_IO_ACCOUNTING 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.
=============================================================
In case CONFIG_BC_IO_ACCOUNTING is defined, virtinfo.h
is included via task_io_accounting_ops.h that includes
bc/io_acct.h that includes virtinfo.h.
In case CONFIG_BC_IO_ACCOUNTING is not defined, we are screwed.
Signed-off-by: Kir Kolyshkin <k...@openvz.org>
---
fs/direct-io.c | 1 +
include/bc/io_acct.h | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/fs/direct-io.c b/fs/direct-io.c
index 8e67f35..b61227d 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -38,6 +38,7 @@
#include <linux/atomic.h>
#include <linux/prefetch.h>
#include <linux/aio.h>
+#include <linux/virtinfo.h>
/*
* How many user pages to map in one call to get_user_pages(). This determines
diff --git a/include/bc/io_acct.h b/include/bc/io_acct.h
index 0456fbf..b3bcfd1 100644
--- a/include/bc/io_acct.h
+++ b/include/bc/io_acct.h
@@ -118,6 +118,11 @@ static inline bool ub_should_skip_writeback(struct
user_beancounter *ub,
return false;
}
+static inline struct user_beancounter *get_io_ub(void)
+{
+ return NULL;
+}
+
#endif /* UBC_IO_ACCT */
#endif
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
