diff options
| author | Milosz Tanski <milosz@adfin.com> | 2013-09-06 12:41:20 -0400 |
|---|---|---|
| committer | Milosz Tanski <milosz@adfin.com> | 2013-09-06 12:41:20 -0400 |
| commit | cd0a2df681ec2af45f50c555c2a39dc92a4dff71 (patch) | |
| tree | 35d2278a9494582025f3dac08feb2266adef6a4d /mm/memcontrol.c | |
| parent | c35455791c1131e7ccbf56ea6fbdd562401c2ce2 (diff) | |
| parent | 5a6f282a2052bb13171b53f03b34501cf72c33f1 (diff) | |
Merge tag 'fscache-fixes-for-ceph' into wip-fscache
Patches for Ceph FS-Cache support
Diffstat (limited to 'mm/memcontrol.c')
| -rw-r--r-- | mm/memcontrol.c | 1 |
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 = { | |||
| 6969 | #ifdef CONFIG_MEMCG_SWAP | 6969 | #ifdef CONFIG_MEMCG_SWAP |
| 6970 | static int __init enable_swap_account(char *s) | 6970 | static int __init enable_swap_account(char *s) |
| 6971 | { | 6971 | { |
| 6972 | /* consider enabled if no parameter or 1 is given */ | ||
| 6973 | if (!strcmp(s, "1")) | 6972 | if (!strcmp(s, "1")) |
| 6974 | really_do_swap_account = 1; | 6973 | really_do_swap_account = 1; |
| 6975 | else if (!strcmp(s, "0")) | 6974 | else if (!strcmp(s, "0")) |