diff --git a/[refs] b/[refs]
index b3b2cee3fd85..f62a57a9b2d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5bd910696a27e505078c19ba6b4143537570681
+refs/heads/master: 6f39ce056ab2ab2d29b2fae4aed61ed0b485972f
diff --git a/trunk/include/linux/migrate.h b/trunk/include/linux/migrate.h
index 3c1941e40e61..085527fb8261 100644
--- a/trunk/include/linux/migrate.h
+++ b/trunk/include/linux/migrate.h
@@ -50,7 +50,7 @@ static inline int migrate_vmas(struct mm_struct *mm,
 static inline void migrate_page_copy(struct page *newpage,
 				     struct page *page) {}
 
-extern int migrate_huge_page_move_mapping(struct address_space *mapping,
+static inline int migrate_huge_page_move_mapping(struct address_space *mapping,
 				  struct page *newpage, struct page *page)
 {
 	return -ENOSYS;