On Wed 14-08-13 15:21:35, Gergely Risko wrote:
> Fixed swap accounting option parsing to enable if called without argument.
We used to have [no]swapaccount but that one has been removed by a2c8990a
(memsw: remove noswapaccount kernel parameter) so I do not think that
swapaccount without any given value makes much sense these days.
> Signed-off-by: Gergely Risko <gergely@xxxxxxxx>
> ---
> mm/memcontrol.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index c290a1c..8ec2507 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -6970,13 +6970,13 @@ struct cgroup_subsys mem_cgroup_subsys = {
> static int __init enable_swap_account(char *s)
> {
> /* consider enabled if no parameter or 1 is given */
> - if (!strcmp(s, "1"))
> + if (*s++ != '=' || !*s || !strcmp(s, "1"))
> really_do_swap_account = 1;
> else if (!strcmp(s, "0"))
> really_do_swap_account = 0;
> return 1;
> }
> -__setup("swapaccount=", enable_swap_account);
> +__setup("swapaccount", enable_swap_account);
>
> static void __init memsw_file_init(void)
> {
> --
> 1.8.3.2
>
> --
> To unsubscribe, send a message with 'unsubscribe linux-mm' in
> the body to majordomo@xxxxxxxxx. For more info on Linux MM,
> see: http://www.linux-mm.org/ .
> Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>
--
Michal Hocko
SUSE Labs
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>