From: David Rientjes <rientjes@google.com>
To: Hugh Dickins <hughd@google.com>,
Andrew Morton <akpm@linux-foundation.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>,
Johannes Weiner <hannes@cmpxchg.org>,
Michal Hocko <mhocko@suse.cz>,
linux-mm@kvack.org
Subject: [patch] memcg swap: use mem_cgroup_uncharge_swap fix
Date: Wed, 4 Apr 2012 20:19:18 -0700 (PDT) [thread overview]
Message-ID: <alpine.DEB.2.00.1204042017520.8789@chino.kir.corp.google.com> (raw)
In-Reply-To: <alpine.LSU.2.00.1203231351310.1940@eggly.anvils>
linux-next fails with this
mm/memcontrol.c: In function '__mem_cgroup_commit_charge_swapin':
mm/memcontrol.c:2837: error: implicit declaration of function 'mem_cgroup_uncharge_swap'
if CONFIG_SWAP is disabled. Fix it.
Signed-off-by: David Rientjes <rientjes@google.com>
---
include/linux/swap.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/include/linux/swap.h b/include/linux/swap.h
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -529,6 +529,10 @@ static inline void deactivate_swap_token(struct mm_struct *mm, bool swap_token)
{
}
+static inline void mem_cgroup_uncharge_swap(swp_entry_t ent)
+{
+}
+
static inline void disable_swap_token(struct mem_cgroup *memcg)
{
}
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2012-04-05 3:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-23 20:54 [PATCH] memcg swap: use mem_cgroup_uncharge_swap Hugh Dickins
2012-03-24 0:29 ` Johannes Weiner
2012-03-26 1:13 ` KAMEZAWA Hiroyuki
2012-04-05 3:19 ` David Rientjes [this message]
2012-04-05 14:49 ` [patch] memcg swap: use mem_cgroup_uncharge_swap fix Michal Hocko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.00.1204042017520.8789@chino.kir.corp.google.com \
--to=rientjes@google.com \
--cc=akpm@linux-foundation.org \
--cc=hannes@cmpxchg.org \
--cc=hughd@google.com \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.cz \
--cc=nishimura@mxp.nes.nec.co.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox