diff --git a/[refs] b/[refs] index 6b680ddd4a1b..9d719f6aea9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8bf2d8ba4fbc093de7c0d192fe5d2531f14b8b9 +refs/heads/master: be49a6e13537f32f85bd8c4ba04317ca36ca60ff diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 5a8d339d282a..4171cd4f8257 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -5727,7 +5727,7 @@ static int __alloc_contig_migrate_range(struct compact_control *cc, unsigned int tries = 0; int ret = 0; - migrate_prep_local(); + migrate_prep(); while (pfn < end || !list_empty(&cc->migratepages)) { if (fatal_signal_pending(current)) {