diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-04 14:54:56 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-04 14:54:56 +0100 |
| commit | bb960a1e42042e82447a5bc0941b3ab6d614bac3 (patch) | |
| tree | d2295a923fabb1b01b25bb015c4c2e42ee9df5ca /arch/m68k/mm | |
| parent | 858770619debfb9269add63e4ba8b7c6b5538dd1 (diff) | |
| parent | 06fc732c33a7ff5e4c91bcf4a6ca86b5e335ad9a (diff) | |
| download | kernel_samsung_aries-bb960a1e42042e82447a5bc0941b3ab6d614bac3.zip kernel_samsung_aries-bb960a1e42042e82447a5bc0941b3ab6d614bac3.tar.gz kernel_samsung_aries-bb960a1e42042e82447a5bc0941b3ab6d614bac3.tar.bz2 | |
Merge branch 'core/xen' into x86/urgent
Diffstat (limited to 'arch/m68k/mm')
| -rw-r--r-- | arch/m68k/mm/init.c | 4 | ||||
| -rw-r--r-- | arch/m68k/mm/motorola.c | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c index 81bb08c..0007b2a 100644 --- a/arch/m68k/mm/init.c +++ b/arch/m68k/mm/init.c @@ -28,6 +28,7 @@ #ifdef CONFIG_ATARI #include <asm/atari_stram.h> #endif +#include <asm/sections.h> #include <asm/tlb.h> DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); @@ -73,9 +74,6 @@ extern void init_pointer_table(unsigned long ptable); /* References to section boundaries */ -extern char _text[], _etext[]; -extern char __init_begin[], __init_end[]; - extern pmd_t *zero_pgtable; void __init mem_init(void) diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c index c5dbb9b..4665fc8 100644 --- a/arch/m68k/mm/motorola.c +++ b/arch/m68k/mm/motorola.c @@ -30,6 +30,7 @@ #ifdef CONFIG_ATARI #include <asm/atari_stram.h> #endif +#include <asm/sections.h> #undef DEBUG @@ -301,14 +302,12 @@ void __init paging_init(void) } } -extern char __init_begin, __init_end; - void free_initmem(void) { unsigned long addr; - addr = (unsigned long)&__init_begin; - for (; addr < (unsigned long)&__init_end; addr += PAGE_SIZE) { + addr = (unsigned long)__init_begin; + for (; addr < (unsigned long)__init_end; addr += PAGE_SIZE) { virt_to_page(addr)->flags &= ~(1 << PG_reserved); init_page_count(virt_to_page(addr)); free_page(addr); |