diff --git a/[refs] b/[refs] index 30274f2d8773..79ec75de411b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df0bcab2c66ac876d5e80864fca5cce944a44540 +refs/heads/master: c700be3d1320d2be4f04c8a5330186b7df724438 diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c index 9a29901ad3b3..967d30ccd92b 100644 --- a/trunk/mm/vmscan.c +++ b/trunk/mm/vmscan.c @@ -1307,7 +1307,7 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist, struct scan_control *sc) { int priority; - int ret = 0; + unsigned long ret = 0; unsigned long total_scanned = 0; unsigned long nr_reclaimed = 0; struct reclaim_state *reclaim_state = current->reclaim_state;