x86: unify free_init_pages() and free_initmem()
Impact: unification This patch introduces a common arch/x86/mm/init.c and moves the identical free_init_pages() and free_initmem() functions to the file. Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> LKML-Reference: <1236078906.2675.18.camel@penberg-laptop> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
e087edd8c0
commit
e5b2bb5527
4 changed files with 50 additions and 89 deletions
|
@ -1,4 +1,4 @@
|
||||||
obj-y := init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \
|
obj-y := init.o init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \
|
||||||
pat.o pgtable.o gup.o
|
pat.o pgtable.o gup.o
|
||||||
|
|
||||||
obj-$(CONFIG_SMP) += tlb.o
|
obj-$(CONFIG_SMP) += tlb.o
|
||||||
|
|
49
arch/x86/mm/init.c
Normal file
49
arch/x86/mm/init.c
Normal file
|
@ -0,0 +1,49 @@
|
||||||
|
#include <linux/swap.h>
|
||||||
|
#include <asm/cacheflush.h>
|
||||||
|
#include <asm/page.h>
|
||||||
|
#include <asm/sections.h>
|
||||||
|
#include <asm/system.h>
|
||||||
|
|
||||||
|
void free_init_pages(char *what, unsigned long begin, unsigned long end)
|
||||||
|
{
|
||||||
|
unsigned long addr = begin;
|
||||||
|
|
||||||
|
if (addr >= end)
|
||||||
|
return;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If debugging page accesses then do not free this memory but
|
||||||
|
* mark them not present - any buggy init-section access will
|
||||||
|
* create a kernel page fault:
|
||||||
|
*/
|
||||||
|
#ifdef CONFIG_DEBUG_PAGEALLOC
|
||||||
|
printk(KERN_INFO "debug: unmapping init memory %08lx..%08lx\n",
|
||||||
|
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) {
|
||||||
|
ClearPageReserved(virt_to_page(addr));
|
||||||
|
init_page_count(virt_to_page(addr));
|
||||||
|
memset((void *)(addr & ~(PAGE_SIZE-1)),
|
||||||
|
POISON_FREE_INITMEM, PAGE_SIZE);
|
||||||
|
free_page(addr);
|
||||||
|
totalram_pages++;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
void free_initmem(void)
|
||||||
|
{
|
||||||
|
free_init_pages("unused kernel memory",
|
||||||
|
(unsigned long)(&__init_begin),
|
||||||
|
(unsigned long)(&__init_end));
|
||||||
|
}
|
|
@ -1212,50 +1212,6 @@ void mark_rodata_ro(void)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void free_init_pages(char *what, unsigned long begin, unsigned long end)
|
|
||||||
{
|
|
||||||
unsigned long addr = begin;
|
|
||||||
|
|
||||||
if (addr >= end)
|
|
||||||
return;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If debugging page accesses then do not free this memory but
|
|
||||||
* mark them not present - any buggy init-section access will
|
|
||||||
* create a kernel page fault:
|
|
||||||
*/
|
|
||||||
#ifdef CONFIG_DEBUG_PAGEALLOC
|
|
||||||
printk(KERN_INFO "debug: unmapping init memory %08lx..%08lx\n",
|
|
||||||
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) {
|
|
||||||
ClearPageReserved(virt_to_page(addr));
|
|
||||||
init_page_count(virt_to_page(addr));
|
|
||||||
memset((void *)(addr & ~(PAGE_SIZE-1)),
|
|
||||||
POISON_FREE_INITMEM, PAGE_SIZE);
|
|
||||||
free_page(addr);
|
|
||||||
totalram_pages++;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void free_initmem(void)
|
|
||||||
{
|
|
||||||
free_init_pages("unused kernel memory",
|
|
||||||
(unsigned long)(&__init_begin),
|
|
||||||
(unsigned long)(&__init_end));
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef CONFIG_BLK_DEV_INITRD
|
#ifdef CONFIG_BLK_DEV_INITRD
|
||||||
void free_initrd_mem(unsigned long start, unsigned long end)
|
void free_initrd_mem(unsigned long start, unsigned long end)
|
||||||
{
|
{
|
||||||
|
|
|
@ -945,50 +945,6 @@ void __init mem_init(void)
|
||||||
initsize >> 10);
|
initsize >> 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
void free_init_pages(char *what, unsigned long begin, unsigned long end)
|
|
||||||
{
|
|
||||||
unsigned long addr = begin;
|
|
||||||
|
|
||||||
if (addr >= end)
|
|
||||||
return;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If debugging page accesses then do not free this memory but
|
|
||||||
* mark them not present - any buggy init-section access will
|
|
||||||
* create a kernel page fault:
|
|
||||||
*/
|
|
||||||
#ifdef CONFIG_DEBUG_PAGEALLOC
|
|
||||||
printk(KERN_INFO "debug: unmapping init memory %08lx..%08lx\n",
|
|
||||||
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) {
|
|
||||||
ClearPageReserved(virt_to_page(addr));
|
|
||||||
init_page_count(virt_to_page(addr));
|
|
||||||
memset((void *)(addr & ~(PAGE_SIZE-1)),
|
|
||||||
POISON_FREE_INITMEM, PAGE_SIZE);
|
|
||||||
free_page(addr);
|
|
||||||
totalram_pages++;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void free_initmem(void)
|
|
||||||
{
|
|
||||||
free_init_pages("unused kernel memory",
|
|
||||||
(unsigned long)(&__init_begin),
|
|
||||||
(unsigned long)(&__init_end));
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef CONFIG_DEBUG_RODATA
|
#ifdef CONFIG_DEBUG_RODATA
|
||||||
const int rodata_test_data = 0xC3;
|
const int rodata_test_data = 0xC3;
|
||||||
EXPORT_SYMBOL_GPL(rodata_test_data);
|
EXPORT_SYMBOL_GPL(rodata_test_data);
|
||||||
|
|
Loading…
Reference in a new issue