diff --git a/[refs] b/[refs] index d883da287494..19505befd30b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ae05fb254a5f2617fc8fcfff7be959b54a5e963 +refs/heads/master: 8713e01295140f674a41f2199b0f7ca99dfb69d5 diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c index eac9577941f9..5fa3eda1f03f 100644 --- a/trunk/mm/vmscan.c +++ b/trunk/mm/vmscan.c @@ -1471,7 +1471,7 @@ static void shrink_zone(int priority, struct zone *zone, for_each_evictable_lru(l) { int file = is_file_lru(l); - int scan; + unsigned long scan; scan = zone_nr_pages(zone, sc, l); if (priority) {