[Devel] [PATCH RHEL7 COMMIT] ve/mm: include virtinfo.h for !CONFIG_BC_IO_ACCOUNTING case

Konstantin Khorenko khorenko at odin.com
Thu May 7 09:28:11 PDT 2015


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

    ve/mm: include virtinfo.h 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 <kir at openvz.org>
---
 mm/page-writeback.c | 1 +
 mm/readahead.c      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index b0f33bf..855043c 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -36,6 +36,7 @@
 #include <linux/pagevec.h>
 #include <linux/timer.h>
 #include <linux/sched/rt.h>
+#include <linux/virtinfo.h>
 #include <trace/events/writeback.h>
 
 /*
diff --git a/mm/readahead.c b/mm/readahead.c
index d0b4118..6e53aef 100644
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -19,6 +19,7 @@
 #include <linux/pagemap.h>
 #include <linux/syscalls.h>
 #include <linux/file.h>
+#include <linux/virtinfo.h>
 
 /*
  * Initialise a struct file's readahead state.  Assumes that the caller has



More information about the Devel mailing list