From 5b27f1c548e575bb643db7c766cb7625cb82b117 Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com>
Date: Wed, 30 Jan 2008 13:34:09 +0100
Subject: [PATCH] --- yaml --- r: 80545 b: refs/heads/master c:
 1a4872529e13265d05ffae75b8d09697540016d2 h: refs/heads/master i:   80543:
 e84d42130297de428638dde7994f93c8a757c645 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/mm/init_64.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cffa6cfdfcff..c2c467f5f8cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c61afcdb2cd4be299c1442b33adf312b695e2d7
+refs/heads/master: 1a4872529e13265d05ffae75b8d09697540016d2
diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c
index 50d29f5da02b..f51180c02b8f 100644
--- a/trunk/arch/x86/mm/init_64.c
+++ b/trunk/arch/x86/mm/init_64.c
@@ -573,7 +573,6 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
 		set_memory_rw(begin, (end - begin)/PAGE_SIZE);
 		set_memory_np(begin, (end - begin)/PAGE_SIZE);
 		set_memory_nx(begin, (end - begin)/PAGE_SIZE);
-		rodata_test();
 	}
 #endif
 }
@@ -614,6 +613,8 @@ void mark_rodata_ro(void)
 	printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n",
 	       (end - start) >> 10);
 
+	rodata_test();
+
 #ifdef CONFIG_CPA_DEBUG
 	printk("Testing CPA: undo %lx-%lx\n", start, end);
 	set_memory_rw(start, (end-start) >> PAGE_SHIFT);