diff --git a/[refs] b/[refs]
index c747c0aebf2d..3e7ee46f4149 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac6aadb24b7d4f0e54246732e221c102073412bf
+refs/heads/master: b45445684198a946b587732265692e6495993abf
diff --git a/trunk/include/linux/mmzone.h b/trunk/include/linux/mmzone.h
index 498d6ceff2f4..0aece6d8937e 100644
--- a/trunk/include/linux/mmzone.h
+++ b/trunk/include/linux/mmzone.h
@@ -841,7 +841,10 @@ static inline struct zoneref *first_zones_zonelist(struct zonelist *zonelist,
 
 #if !defined(CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID) && \
 	!defined(CONFIG_ARCH_POPULATES_NODE_MAP)
-#define early_pfn_to_nid(nid)  (0UL)
+static inline unsigned long early_pfn_to_nid(unsigned long pfn)
+{
+	return 0;
+}
 #endif
 
 #ifdef CONFIG_FLATMEM