From 5b35c33ec115218de9a6cf6a7b349ac7731bc2fd Mon Sep 17 00:00:00 2001
From: Stanislaw Gruszka <sgruszka@redhat.com>
Date: Tue, 29 Nov 2011 17:05:11 +0100
Subject: [PATCH] --- yaml --- r: 283525 b: refs/heads/master c:
 54c29c635ae91f5d75ced7bffeaa77ba37ca02bb h: refs/heads/master i:   283523:
 7160ae76e5ecba9a6c9dfe8795565ded52d484aa v: v3

---
 [refs]                       |  2 +-
 trunk/arch/x86/mm/pageattr.c |  6 ------
 trunk/include/linux/mm.h     | 10 ----------
 trunk/init/main.c            |  5 -----
 trunk/mm/debug-pagealloc.c   |  3 ---
 5 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/[refs] b/[refs]
index c76640b31399..95af5456b87a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 855c743a27bb58a9a521bdc485ef5acfdb69badc
+refs/heads/master: 54c29c635ae91f5d75ced7bffeaa77ba37ca02bb
diff --git a/trunk/arch/x86/mm/pageattr.c b/trunk/arch/x86/mm/pageattr.c
index f9e526742fa1..5031eefa051f 100644
--- a/trunk/arch/x86/mm/pageattr.c
+++ b/trunk/arch/x86/mm/pageattr.c
@@ -1333,12 +1333,6 @@ void kernel_map_pages(struct page *page, int numpages, int enable)
 					   numpages * PAGE_SIZE);
 	}
 
-	/*
-	 * If page allocator is not up yet then do not call c_p_a():
-	 */
-	if (!debug_pagealloc_enabled)
-		return;
-
 	/*
 	 * The return value is ignored as the calls cannot fail.
 	 * Large pages for identity mappings are not used at boot time
diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
index 3dc3a8c2c485..0a22db144753 100644
--- a/trunk/include/linux/mm.h
+++ b/trunk/include/linux/mm.h
@@ -1537,23 +1537,13 @@ static inline void vm_stat_account(struct mm_struct *mm,
 #endif /* CONFIG_PROC_FS */
 
 #ifdef CONFIG_DEBUG_PAGEALLOC
-extern int debug_pagealloc_enabled;
-
 extern void kernel_map_pages(struct page *page, int numpages, int enable);
-
-static inline void enable_debug_pagealloc(void)
-{
-	debug_pagealloc_enabled = 1;
-}
 #ifdef CONFIG_HIBERNATION
 extern bool kernel_page_present(struct page *page);
 #endif /* CONFIG_HIBERNATION */
 #else
 static inline void
 kernel_map_pages(struct page *page, int numpages, int enable) {}
-static inline void enable_debug_pagealloc(void)
-{
-}
 #ifdef CONFIG_HIBERNATION
 static inline bool kernel_page_present(struct page *page) { return true; }
 #endif /* CONFIG_HIBERNATION */
diff --git a/trunk/init/main.c b/trunk/init/main.c
index 217ed23e9487..99c4ba30ba7e 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -282,10 +282,6 @@ static int __init unknown_bootoption(char *param, char *val)
 	return 0;
 }
 
-#ifdef CONFIG_DEBUG_PAGEALLOC
-int __read_mostly debug_pagealloc_enabled = 0;
-#endif
-
 static int __init init_setup(char *str)
 {
 	unsigned int i;
@@ -597,7 +593,6 @@ asmlinkage void __init start_kernel(void)
 	}
 #endif
 	page_cgroup_init();
-	enable_debug_pagealloc();
 	debug_objects_mem_init();
 	kmemleak_init();
 	setup_per_cpu_pageset();
diff --git a/trunk/mm/debug-pagealloc.c b/trunk/mm/debug-pagealloc.c
index 7cea557407f4..789ff70c8a4a 100644
--- a/trunk/mm/debug-pagealloc.c
+++ b/trunk/mm/debug-pagealloc.c
@@ -95,9 +95,6 @@ static void unpoison_pages(struct page *page, int n)
 
 void kernel_map_pages(struct page *page, int numpages, int enable)
 {
-	if (!debug_pagealloc_enabled)
-		return;
-
 	if (enable)
 		unpoison_pages(page, numpages);
 	else