diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2011-07-25 17:12:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 20:57:09 -0700 |
| commit | 00a66d2974485d7d95d61d5772142b2a2231ed2a (patch) | |
| tree | 14d5ca10dfc641594e7109902cdabb4a3c408d98 /mm | |
| parent | dd78553b5e7a0b34c0b60478d04ee16d8d8f4fa7 (diff) | |
| download | linux-3.10-00a66d2974485d7d95d61d5772142b2a2231ed2a.tar.gz linux-3.10-00a66d2974485d7d95d61d5772142b2a2231ed2a.tar.bz2 linux-3.10-00a66d2974485d7d95d61d5772142b2a2231ed2a.zip | |
mm: remove the leftovers of noswapaccount
In commit a2c8990aed5ab ("memsw: remove noswapaccount kernel parameter"),
Michal forgot to remove some left pieces of noswapaccount in the tree,
this patch removes them all.
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/page_cgroup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c index 53bffc6c293..9cb1c44ffc3 100644 --- a/mm/page_cgroup.c +++ b/mm/page_cgroup.c @@ -537,7 +537,7 @@ int swap_cgroup_swapon(int type, unsigned long max_pages) nomem: printk(KERN_INFO "couldn't allocate enough memory for swap_cgroup.\n"); printk(KERN_INFO - "swap_cgroup can be disabled by noswapaccount boot option\n"); + "swap_cgroup can be disabled by swapaccount=0 boot option\n"); return -ENOMEM; } |