diff --git a/[refs] b/[refs] index bea8f687ec7f..6b70b893dd31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e9dc5df46001510ebd3b3e54faa650f474e51a3 +refs/heads/master: 3f380998aeb51b99d5d22cadb41162e1e9db70d2 diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c index 51bc4bf3f723..ac644fe85589 100644 --- a/trunk/mm/vmscan.c +++ b/trunk/mm/vmscan.c @@ -3520,8 +3520,8 @@ static ssize_t write_scan_unevictable_node(struct sys_device *dev, unsigned long res; unsigned long req = strict_strtoul(buf, 10, &res); - if (!req) - return 1; /* zero is no-op */ + if (req || !res) + return 1; /* Invalid input or zero is no-op */ for (zone = node_zones; zone - node_zones < MAX_NR_ZONES; ++zone) { if (!populated_zone(zone))