From 6b046688373cdc6bd80ef8eb8640f9a5ffeab08c Mon Sep 17 00:00:00 2001 From: Minchan Kim Date: Fri, 11 May 2012 09:37:13 +0200 Subject: [PATCH] --- yaml --- r: 308031 b: refs/heads/master c: 58f42fd54144346898e6dc6d6ae3acd4c591b42f h: refs/heads/master i: 308029: 1b2a1afc60328876e771e8766bfd5eea9d946d28 308027: 257118076e0efd2719191c016a81f7e095f61c6a 308023: c27c89b11c06cc4e37eb9c0172c58a4d38fd84ed 308015: a769893d7a87317498790ff387f5013676ba7cd2 307999: 2bb68a610edd0224947d899ed6039256d212fb49 307967: a4eb8d801bcb15e2437bdb9b8b82f8212ec58d41 v: v3 --- [refs] | 2 +- trunk/mm/page_alloc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f648701db52c..69da70cef94a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c79095092834a18ae74cfc08def1a5a101dc106c +refs/heads/master: 58f42fd54144346898e6dc6d6ae3acd4c591b42f diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 22348ae1005d..ed85c02c1f6e 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -5682,7 +5682,7 @@ static int __alloc_contig_migrate_range(unsigned long start, unsigned long end) ret = migrate_pages(&cc.migratepages, __alloc_contig_migrate_alloc, - 0, false, true); + 0, false, MIGRATE_SYNC); } putback_lru_pages(&cc.migratepages);