From 05280359c1bbe9e57d4c65f8024bd10394b16359 Mon Sep 17 00:00:00 2001
From: Russ Anderson <rja@sgi.com>
Date: Fri, 22 Mar 2013 15:04:43 -0700
Subject: [PATCH] --- yaml --- r: 361669 b: refs/heads/master c:
 f9228b204f789493117e458d2fefae937edb7272 h: refs/heads/master i:   361667:
 cbf01eb177a7a2aad45c0e35b8a820ae967fb6fa v: v3

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

diff --git a/[refs] b/[refs]
index a410210f1910..702ad2ea0abb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ca067efd82939dfd87827d29d36a265823a4c2f
+refs/heads/master: f9228b204f789493117e458d2fefae937edb7272
diff --git a/trunk/include/linux/mmzone.h b/trunk/include/linux/mmzone.h
index ede274957e05..c74092eebf5c 100644
--- a/trunk/include/linux/mmzone.h
+++ b/trunk/include/linux/mmzone.h
@@ -527,7 +527,7 @@ static inline int zone_is_oom_locked(const struct zone *zone)
 	return test_bit(ZONE_OOM_LOCKED, &zone->flags);
 }
 
-static inline unsigned zone_end_pfn(const struct zone *zone)
+static inline unsigned long zone_end_pfn(const struct zone *zone)
 {
 	return zone->zone_start_pfn + zone->spanned_pages;
 }