|
@@ -1647,19 +1647,11 @@ static inline void expand(struct zone *zone, struct page *page,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-/*
|
|
|
- * This page is about to be returned from the page allocator
|
|
|
- */
|
|
|
-static inline int check_new_page(struct page *page)
|
|
|
+static void check_new_page_bad(struct page *page)
|
|
|
{
|
|
|
- const char *bad_reason;
|
|
|
- unsigned long bad_flags;
|
|
|
+ const char *bad_reason = NULL;
|
|
|
+ unsigned long bad_flags = 0;
|
|
|
|
|
|
- if (page_expected_state(page, PAGE_FLAGS_CHECK_AT_PREP|__PG_HWPOISON))
|
|
|
- return 0;
|
|
|
-
|
|
|
- bad_reason = NULL;
|
|
|
- bad_flags = 0;
|
|
|
if (unlikely(atomic_read(&page->_mapcount) != -1))
|
|
|
bad_reason = "nonzero mapcount";
|
|
|
if (unlikely(page->mapping != NULL))
|
|
@@ -1678,11 +1670,20 @@ static inline int check_new_page(struct page *page)
|
|
|
if (unlikely(page->mem_cgroup))
|
|
|
bad_reason = "page still charged to cgroup";
|
|
|
#endif
|
|
|
- if (unlikely(bad_reason)) {
|
|
|
- bad_page(page, bad_reason, bad_flags);
|
|
|
- return 1;
|
|
|
- }
|
|
|
- return 0;
|
|
|
+ bad_page(page, bad_reason, bad_flags);
|
|
|
+}
|
|
|
+
|
|
|
+/*
|
|
|
+ * This page is about to be returned from the page allocator
|
|
|
+ */
|
|
|
+static inline int check_new_page(struct page *page)
|
|
|
+{
|
|
|
+ if (likely(page_expected_state(page,
|
|
|
+ PAGE_FLAGS_CHECK_AT_PREP|__PG_HWPOISON)))
|
|
|
+ return 0;
|
|
|
+
|
|
|
+ check_new_page_bad(page);
|
|
|
+ return 1;
|
|
|
}
|
|
|
|
|
|
static inline bool free_pages_prezeroed(bool poisoned)
|