diff --git a/[refs] b/[refs]
index c883035ed4ac..67390b1e5db8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11e33f6a55ed7847d9c8ffe185ef87faf7806abe
+refs/heads/master: 49255c619fbd482d704289b5eb2795f8e3b7ff2e
diff --git a/trunk/include/linux/mmzone.h b/trunk/include/linux/mmzone.h
index a47c879e1304..0aa4445b0b8a 100644
--- a/trunk/include/linux/mmzone.h
+++ b/trunk/include/linux/mmzone.h
@@ -50,9 +50,6 @@ extern int page_group_by_mobility_disabled;
 
 static inline int get_pageblock_migratetype(struct page *page)
 {
-	if (unlikely(page_group_by_mobility_disabled))
-		return MIGRATE_UNMOVABLE;
-
 	return get_pageblock_flags_group(page, PB_migrate, PB_migrate_end);
 }
 
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 512bf9a618c7..b09859629e93 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -168,6 +168,10 @@ int page_group_by_mobility_disabled __read_mostly;
 
 static void set_pageblock_migratetype(struct page *page, int migratetype)
 {
+
+	if (unlikely(page_group_by_mobility_disabled))
+		migratetype = MIGRATE_UNMOVABLE;
+
 	set_pageblock_flags_group(page, (unsigned long)migratetype,
 					PB_migrate, PB_migrate_end);
 }