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

Konstantin Khorenko khorenko at odin.com
Thu May 7 09:28:12 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 2aa67fdf2f2a8096311ab22afae0537d123c5446
Author: Kir Kolyshkin <kir at openvz.org>
Date:   Thu May 7 20:28:12 2015 +0400

    ve/mm/filemap.c: 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 not set, linux/virtinfo.h
    is not getting included into mm/filemap.c via bc/io_acct.h,
    and we have this:
    
    	mm/filemap.c: In function ‘do_generic_file_read’:
    	mm/filemap.c:1573:3: error: implicit declaration of function
    	‘virtinfo_notifier_call’ [-Werror=implicit-function-declaration]
    	   virtinfo_notifier_call(VITYPE_IO, VIRTINFO_IO_PREPARE, NULL);
    
    Signed-off-by: Kir Kolyshkin <kir at openvz.org>
---
 mm/filemap.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mm/filemap.c b/mm/filemap.c
index c328b4a..43e3345 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -45,6 +45,7 @@
 
 #include <asm/mman.h>
 
+#include <linux/virtinfo.h>
 #include <bc/io_acct.h>
 
 /*



More information about the Devel mailing list