Re: [cgroup:review-cgroup-writeback-20150106 65/265] mm/page-writeback.c:2314:10: error: too few arguments to function 'mem_cgroup_begin_page_stat'

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Jan 07, 2015 at 03:22:14AM +0800, kbuild test robot wrote:
> tree:   git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git review-cgroup-writeback-20150106
> head:   393b71c00e25227a020f9dbf8ffdddebac4fdf1e
> commit: db73c712993c8bea02a97a5e936f965efc1de435 [65/265] mm: memcontrol: track move_lock state internally
> config: parisc-c3000_defconfig (attached as .config)
> reproduce:
>   wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
>   chmod +x ~/bin/make.cross
>   git checkout db73c712993c8bea02a97a5e936f965efc1de435
>   # save the attached .config to linux build tree
>   make.cross ARCH=parisc 
> 
> All error/warnings:
> 
>    mm/page-writeback.c: In function 'test_clear_page_writeback':
> >> mm/page-writeback.c:2314:10: error: too few arguments to function 'mem_cgroup_begin_page_stat'
>      memcg = mem_cgroup_begin_page_stat(page);
>              ^
>    In file included from include/linux/swap.h:8:0,
>                     from mm/page-writeback.c:19:
>    include/linux/memcontrol.h:286:34: note: declared here
>     static inline struct mem_cgroup *mem_cgroup_begin_page_stat(struct page *page,

Andrew, could you please fold the following fix?  Thanks!

>From c2c89455753e2c098c216bd96377bc7e47579629 Mon Sep 17 00:00:00 2001
From: Johannes Weiner <hannes@xxxxxxxxxxx>
Date: Tue, 6 Jan 2015 14:27:28 -0500
Subject: [patch] mm: memcontrol: track move_lock state internally fix

Update the !CONFIG_MEMCG page stat dummy API.

Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx>
---
 include/linux/memcontrol.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 5480e6047452..8703520cea07 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -285,14 +285,12 @@ mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p)
 {
 }
 
-static inline struct mem_cgroup *mem_cgroup_begin_page_stat(struct page *page,
-					bool *locked, unsigned long *flags)
+static inline struct mem_cgroup *mem_cgroup_begin_page_stat(struct page *page)
 {
 	return NULL;
 }
 
-static inline void mem_cgroup_end_page_stat(struct mem_cgroup *memcg,
-					bool *locked, unsigned long *flags)
+static inline void mem_cgroup_end_page_stat(struct mem_cgroup *memcg)
 {
 }
 
-- 
2.2.0

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>



[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]