commit 8c0c51c94ff17d374cfa2978aa0c2456f609d313
author Linux Build Service Account <lnxbuild@localhost> Tue Nov 29 16:58:29 2011 -0800
committer QuIC Gerrit Code Review <code-review@localhost> Tue Nov 29 16:58:29 2011 -0800
tree c99fdb4ca6177f941a9930663174a49cc6dc59ec
parent a90f3352e9ac2a7ac4a8e7dae8ced78303b5396d
parent 1e6ec3c7e399aa84d29ced48b16a91acaba962f0

Merge "mm: Fix infinite loop when offlining" into msm-3.0

mm/memory_hotplug.c

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 8487c49..709dc6d 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -753,7 +753,8 @@
 hotremove_migrate_alloc(struct page *page, unsigned long private, int **x)
 {
 	/* This should be improooooved!! */
-	return alloc_page(GFP_HIGHUSER_MOVABLE);
+	return alloc_page(GFP_HIGHUSER_MOVABLE | __GFP_NORETRY | __GFP_NOWARN |
+				__GFP_NOMEMALLOC);
 }
 
 #define NR_OFFLINE_AT_ONCE_PAGES	(256)