linux-kernel - [PATCH -mmotm] build fix for memcg-improve-performance-in-moving-swap-charge.patch

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20100107130631.144750c3.nishimura@mxp.nes.nec.co.jp>
Date:	Thu, 7 Jan 2010 13:06:31 +0900
From:	Daisuke Nishimura <nishimura@....nes.nec.co.jp>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	Randy Dunlap <randy.dunlap@...cle.com>,
	KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com>,
	linux-kernel@...r.kernel.org, linux-mm@...ck.org,
	Daisuke Nishimura <nishimura@....nes.nec.co.jp>
Subject: [PATCH -mmotm] build fix for
 memcg-improve-performance-in-moving-swap-charge.patch

build fix in !CONFIG_CGROUP_MEM_RES_CTLR_SWAP case.

  CC      mm/memcontrol.o
mm/memcontrol.c: In function 'mem_cgroup_move_charge_pte_range':
mm/memcontrol.c:3899: error: too many arguments to function 'mem_cgroup_move_swap_account'
mm/memcontrol.c:3899: error: too many arguments to function 'mem_cgroup_move_swap_account'
mm/memcontrol.c:3899: error: too many arguments to function 'mem_cgroup_move_swap_account'
make[1]: *** [mm/memcontrol.o] Error 1
make: *** [mm] Error 2

Reported-by: Randy Dunlap <randy.dunlap@...cle.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com>
Signed-off-by: Daisuke Nishimura <nishimura@....nes.nec.co.jp>
---
This can be applied after memcg-improve-performance-in-moving-swap-charge.patch.

 mm/memcontrol.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 5360d48..65df8d2 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2326,7 +2326,7 @@ static int mem_cgroup_move_swap_account(swp_entry_t entry,
 }
 #else
 static inline int mem_cgroup_move_swap_account(swp_entry_t entry,
-				struct mem_cgroup *from, struct mem_cgroup *to)
+		struct mem_cgroup *from, struct mem_cgroup *to, bool need_fixup)
 {
 	return -EINVAL;
 }
-- 
1.5.6.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/