1 files changed, 2 insertions, 6 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 019ceda6a8b6..f564717d22f3 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -156,10 +156,8 @@ static int page_outside_zone_boundaries(struct zone *zone, struct page *page)
 
 static int page_is_consistent(struct zone *zone, struct page *page)
 {
-#ifdef CONFIG_HOLES_IN_ZONE
-        if (!pfn_valid(page_to_pfn(page)))
+        if (!pfn_valid_within(page_to_pfn(page)))
                 return 0;
-#endif
         if (zone != page_zone(page))
                 return 0;
 
@@ -346,10 +344,8 @@ __find_combined_index(unsigned long page_idx, unsigned int order)
 static inline int page_is_buddy(struct page *page, struct page *buddy,
                                                                 int order)
 {
-#ifdef CONFIG_HOLES_IN_ZONE
-        if (!pfn_valid(page_to_pfn(buddy)))
+        if (!pfn_valid_within(page_to_pfn(buddy)))
                 return 0;
-#endif
 
         if (page_zone_id(page) != page_zone_id(buddy))
                 return 0;