1 files changed, 4 insertions, 2 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 6de9440e3ae2..97170131f2ab 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2133,7 +2133,8 @@ __rmqueue_fallback(struct zone *zone, unsigned int order, int start_migratetype)
 
                 page = list_first_entry(&area->free_list[fallback_mt],
                                                 struct page, lru);
-                if (can_steal)
+                if (can_steal &&
+                        get_pageblock_migratetype(page) != MIGRATE_HIGHATOMIC)
                         steal_suitable_fallback(zone, page, start_migratetype);
 
                 /* Remove the page from the freelists */
@@ -2534,7 +2535,8 @@ int __isolate_free_page(struct page *page, unsigned int order)
                 struct page *endpage = page + (1 << order) - 1;
                 for (; page < endpage; page += pageblock_nr_pages) {
                         int mt = get_pageblock_migratetype(page);
-                        if (!is_migrate_isolate(mt) && !is_migrate_cma(mt))
+                        if (!is_migrate_isolate(mt) && !is_migrate_cma(mt)
+                                && mt != MIGRATE_HIGHATOMIC)
                                 set_pageblock_migratetype(page,
                                                           MIGRATE_MOVABLE);
                 }