lkml.org 
[lkml]   [2010]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 18/32] [PATCH] free_initmem: reduce code duplication
    From: Heiko Carstens <heiko.carstens@de.ibm.com>

    free_initmem() and free_initrd_mem() are nearly identical. So make them
    call a common function.
    Also fixes a bug: if the initrd wouldn't start on a page boundary also
    memory after the initrd would be initialized with the poison value.

    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    ---

    arch/s390/mm/init.c | 33 +++++++++++++++++----------------
    1 file changed, 17 insertions(+), 16 deletions(-)

    Index: quilt-2.6/arch/s390/mm/init.c
    ===================================================================
    --- quilt-2.6.orig/arch/s390/mm/init.c 2010-02-24 09:28:13.000000000 +0100
    +++ quilt-2.6/arch/s390/mm/init.c 2010-02-24 09:44:26.000000000 +0100
    @@ -143,33 +143,34 @@
    }
    #endif

    -void free_initmem(void)
    +void free_init_pages(char *what, unsigned long begin, unsigned long end)
    {
    - unsigned long addr;
    + unsigned long addr = begin;

    - addr = (unsigned long)(&__init_begin);
    - for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
    + if (begin >= end)
    + return;
    + for (; addr < end; addr += PAGE_SIZE) {
    ClearPageReserved(virt_to_page(addr));
    init_page_count(virt_to_page(addr));
    - memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
    + memset((void *)(addr & PAGE_MASK), POISON_FREE_INITMEM,
    + PAGE_SIZE);
    free_page(addr);
    totalram_pages++;
    - }
    - printk ("Freeing unused kernel memory: %ldk freed\n",
    - ((unsigned long)&__init_end - (unsigned long)&__init_begin) >> 10);
    + }
    + printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);
    +}
    +
    +void free_initmem(void)
    +{
    + free_init_pages("unused kernel memory",
    + (unsigned long)&__init_begin,
    + (unsigned long)&__init_end);
    }

    #ifdef CONFIG_BLK_DEV_INITRD
    void free_initrd_mem(unsigned long start, unsigned long end)
    {
    - if (start < end)
    - printk ("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
    - for (; start < end; start += PAGE_SIZE) {
    - ClearPageReserved(virt_to_page(start));
    - init_page_count(virt_to_page(start));
    - free_page(start);
    - totalram_pages++;
    - }
    + free_init_pages("initrd memory", start, end);
    }
    #endif



    \
     
     \ /
      Last update: 2010-02-24 09:51    [W:0.021 / U:1.064 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site