aboutsummaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-08-23 09:52:32 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-08-23 09:52:32 -0700
commit3db0d4defc36fd9ea4d8e09170d4584d41024cd6 (patch)
tree78ee6d6839fce9c0065eeb996a95cc531b74200a /mm
parent6a7492a4b2e05051a44458d7187023e22d580666 (diff)
parentee8a99bdb47f32327bdfaffe35b900ca7161ba4e (diff)
downloadlinux-stericsson-3db0d4defc36fd9ea4d8e09170d4584d41024cd6.tar.gz
Merge branch 'akpm' (patches from Andrew Morton)
Merge fixes from Andrew Morton: "A few fixes. One is a licensing change and I don't do licensing, so please eyeball that one" Licensing eye-balled. * emailed patches from Andrew Morton <akpm@linux-foundation.org>: lib/lz4: correct the LZ4 license memcg: get rid of swapaccount leftovers nilfs2: fix issue with counting number of bio requests for BIO_EOPNOTSUPP error detection nilfs2: remove double bio_put() in nilfs_end_bio_write() for BIO_EOPNOTSUPP error drivers/platform/olpc/olpc-ec.c: initialise earlier
Diffstat (limited to 'mm')
-rw-r--r--mm/memcontrol.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index c5792a5d87ce..0878ff7c26a9 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -6969,7 +6969,6 @@ struct cgroup_subsys mem_cgroup_subsys = {
#ifdef CONFIG_MEMCG_SWAP
static int __init enable_swap_account(char *s)
{
- /* consider enabled if no parameter or 1 is given */
if (!strcmp(s, "1"))
really_do_swap_account = 1;
else if (!strcmp(s, "0"))