Skip to contentSkip to conversation

x86: make sure initmem is writable on 64-bit

PATCH In review Pekka Enberg 1 participant 2 messages Mar 3, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 2/3 x86: make sure initmem is writable on 64-bit

From: Pekka Enberg <[email protected]>

Impact: unification

This patch ports commit 3c1df68b848b39270752ff8d4b956cc4a4dce0f6 ("x86: make sure initmem is writable") to the 64-bit version to unify implementations of free_init_pages().

Cc Arjan van de Ven <[email protected]>
---
 arch/x86/mm/init_64.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
arch/x86/mm/init_64.c +7 -0
index e6d36b4..03da903 100644
@@ -962,6 +962,13 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
 		begin, PAGE_ALIGN(end));
 	set_memory_np(begin, (end - begin) >> PAGE_SHIFT);
 #else
+	/*
+	 * We just marked the kernel text read only above, now that
+	 * we are going to free part of that, we need to make that
+	 * writeable first.
+	 */
+	set_memory_rw(begin, (end - begin) >> PAGE_SHIFT);
+
 	printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);
 
 	for (; addr < end; addr += PAGE_SIZE) {
Signature · 1 line
1.5.4.3
#1 lore raw
Commit-ID:  e087edd8c056292191bb989baf49f83ee509e624
Gitweb:     http://git.kernel.org/tip/e087edd8c056292191bb989baf49f83ee509e624
Author:     "Pekka Enberg" <[email protected]>
AuthorDate: Tue, 3 Mar 2009 13:15:04 +0200
Commit:     Ingo Molnar <[email protected]>
CommitDate: Tue, 3 Mar 2009 12:21:18 +0100

x86: make sure initmem is writable on 64-bit

Impact: unification

This patch ports commit 3c1df68b848b39270752ff8d4b956cc4a4dce0f6 ("x86: make sure initmem is writable") to the 64-bit version to unify implementations of free_init_pages().

Cc Arjan van de Ven <[email protected]>

LKML-Reference: <1236078904.2675.17.camel@penberg-laptop>

---
 arch/x86/mm/init_64.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
arch/x86/mm/init_64.c +7 -0
index e6d36b4..03da903 100644
@@ -962,6 +962,13 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
 		begin, PAGE_ALIGN(end));
 	set_memory_np(begin, (end - begin) >> PAGE_SHIFT);
 #else
+	/*
+	 * We just marked the kernel text read only above, now that
+	 * we are going to free part of that, we need to make that
+	 * writeable first.
+	 */
+	set_memory_rw(begin, (end - begin) >> PAGE_SHIFT);
+
 	printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);
 
 	for (; addr < end; addr += PAGE_SIZE) {