mm/alpha: use common help functions to free reserved pages

Use common help functions to free reserved pages.  Also include
<asm/sections.h> to avoid local declarations.

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c
index 1383f8601a93b7595b290f7ad595f061917c180b..1d4aabfcf9a160318fd790bd22d98646c270bd74 100644 (file)
--- a/arch/alpha/kernel/sys_nautilus.c
+++ b/arch/alpha/kernel/sys_nautilus.c
@@ -185,7 +185,6 @@ nautilus_machine_check(unsigned long vector, unsigned long la_ptr)
        mb();
 }
 
-extern void free_reserved_mem(void *, void *);
 extern void pcibios_claim_one_bus(struct pci_bus *);
 
 static struct resource irongate_io = {
@@ -239,8 +238,8 @@ nautilus_init_pci(void)
        if (pci_mem < memtop)
                memtop = pci_mem;
        if (memtop > alpha_mv.min_mem_address) {
-               free_reserved_mem(__va(alpha_mv.min_mem_address),
-                                 __va(memtop));
+               free_reserved_area((unsigned long)__va(alpha_mv.min_mem_address),
+                                  (unsigned long)__va(memtop), 0, NULL);
                printk("nautilus_init_pci: %ldk freed\n",
                        (memtop - alpha_mv.min_mem_address) >> 10);
        }

diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index 1ad6ca74bed2f5433979a477bbe90db81ddd3d8b..0ba85ee4a466721b1b91a486d04b6752901a38f2 100644 (file)
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c
@@ -31,6 +31,7 @@
 #include <asm/console.h>
 #include <asm/tlb.h>
 #include <asm/setup.h>
+#include <asm/sections.h>
 
 extern void die_if_kernel(char *,struct pt_regs *,long);
 
@@ -281,8 +282,6 @@ printk_memory_info(void)
 {
        unsigned long codesize, reservedpages, datasize, initsize, tmp;
        extern int page_is_ram(unsigned long) __init;
-       extern char _text, _etext, _data, _edata;
-       extern char __init_begin, __init_end;
 
        /* printk all informations */
        reservedpages = 0;
@@ -317,33 +316,16 @@ mem_init(void)
 }
 #endif /* CONFIG_DISCONTIGMEM */
 
-void
-free_reserved_mem(void *start, void *end)
-{
-       void *__start = start;
-       for (; __start < end; __start += PAGE_SIZE) {
-               ClearPageReserved(virt_to_page(__start));
-               init_page_count(virt_to_page(__start));
-               free_page((long)__start);
-               totalram_pages++;
-       }
-}
-
 void
 free_initmem(void)
 {
-       extern char __init_begin, __init_end;
-
-       free_reserved_mem(&__init_begin, &__init_end);
-       printk ("Freeing unused kernel memory: %ldk freed\n",
-               (&__init_end - &__init_begin) >> 10);
+       free_initmem_default(0);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
 void
 free_initrd_mem(unsigned long start, unsigned long end)
 {
-       free_reserved_mem((void *)start, (void *)end);
-       printk ("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
+       free_reserved_area(start, end, 0, "initrd");
 }
 #endif

diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c
index 3973ae3957720dd68143cc0a21ecca2a76e8d48d..33885048fa3680cce1775bfc11a36e229a69c98e 100644 (file)
--- a/arch/alpha/mm/numa.c
+++ b/arch/alpha/mm/numa.c
@@ -17,6 +17,7 @@
 
 #include <asm/hwrpb.h>
 #include <asm/pgalloc.h>
+#include <asm/sections.h>
 
 pg_data_t node_data[MAX_NUMNODES];
 EXPORT_SYMBOL(node_data);
@@ -325,8 +326,6 @@ void __init mem_init(void)
 {
        unsigned long codesize, reservedpages, datasize, initsize, pfn;
        extern int page_is_ram(unsigned long) __init;
-       extern char _text, _etext, _data, _edata;
-       extern char __init_begin, __init_end;
        unsigned long nid, i;
        high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);