diff --git a/[refs] b/[refs]
index a25cd44b32c8..3ab51562426f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0edd73b33426df61b1d8a0a50d1f2ec097500abb
+refs/heads/master: 400e65146c428d2ef677a927786fda2cec545a76
diff --git a/trunk/include/asm-ia64/mmzone.h b/trunk/include/asm-ia64/mmzone.h
index 9491dacc89cf..83ca4043fc11 100644
--- a/trunk/include/asm-ia64/mmzone.h
+++ b/trunk/include/asm-ia64/mmzone.h
@@ -15,6 +15,20 @@
 #include <asm/page.h>
 #include <asm/meminit.h>
 
+static inline int pfn_to_nid(unsigned long pfn)
+{
+#ifdef CONFIG_NUMA
+	extern int paddr_to_nid(unsigned long);
+	int nid = paddr_to_nid(pfn << PAGE_SHIFT);
+	if (nid < 0)
+		return 0;
+	else
+		return nid;
+#else
+	return 0;
+#endif
+}
+
 #ifdef CONFIG_DISCONTIGMEM
 
 #ifdef CONFIG_IA64_DIG /* DIG systems are small */