From 8e15f4f526f36df84b0f8bf8c7c76e79d7a9c59c Mon Sep 17 00:00:00 2001
From: Cody P Schafer <cody@linux.vnet.ibm.com>
Date: Fri, 22 Feb 2013 16:35:27 -0800
Subject: [PATCH] --- yaml --- r: 356600 b: refs/heads/master c:
 da3649e133948d8b7d8c57b05a33faf62ac2cc7e h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/include/linux/mmzone.h | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ed7c0984cf70..0ac7058c4d6a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d29bb9782d22063892e28716cdb76a87d2876ddb
+refs/heads/master: da3649e133948d8b7d8c57b05a33faf62ac2cc7e
diff --git a/trunk/include/linux/mmzone.h b/trunk/include/linux/mmzone.h
index cf8925962b68..ede274957e05 100644
--- a/trunk/include/linux/mmzone.h
+++ b/trunk/include/linux/mmzone.h
@@ -756,11 +756,17 @@ typedef struct pglist_data {
 #define nid_page_nr(nid, pagenr) 	pgdat_page_nr(NODE_DATA(nid),(pagenr))
 
 #define node_start_pfn(nid)	(NODE_DATA(nid)->node_start_pfn)
+#define node_end_pfn(nid) pgdat_end_pfn(NODE_DATA(nid))
 
-#define node_end_pfn(nid) ({\
-	pg_data_t *__pgdat = NODE_DATA(nid);\
-	__pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
-})
+static inline unsigned long pgdat_end_pfn(pg_data_t *pgdat)
+{
+	return pgdat->node_start_pfn + pgdat->node_spanned_pages;
+}
+
+static inline bool pgdat_is_empty(pg_data_t *pgdat)
+{
+	return !pgdat->node_start_pfn && !pgdat->node_spanned_pages;
+}
 
 #include <linux/memory_hotplug.h>