diff options
| author |   Pekka Enberg <penberg@cs.helsinki.fi> | 2009-03-03 13:15:04 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2009-03-03 12:21:18 +0100 |
| commit | e087edd8c056292191bb989baf49f83ee509e624 (patch) | |
| tree | 9dd2ea0b8e4700fd166d31c785be90186eec81d8 /arch/x86/mm/init_64.c | |
| parent | x86: add sanity checks to init_32.c (diff) | |
| download | linux-dev-e087edd8c056292191bb989baf49f83ee509e624.tar.xz linux-dev-e087edd8c056292191bb989baf49f83ee509e624.zip | |
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().
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Arjan van de Ven <arjan@linux.intel.com>
LKML-Reference: <1236078904.2675.17.camel@penberg-laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/init_64.c')
| -rw-r--r-- | arch/x86/mm/init_64.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index e6d36b490250..03da9030d0ee 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -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) { |