lkml.org 
[lkml]   [2013]   [May]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6, part3 03/16] mm/ARM64: kill poison_init_mem()
    Date
    Use free_reserved_area() to poison initmem memory pages and kill
    poison_init_mem() on ARM64.

    Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
    Cc: Catalin Marinas <catalin.marinas@arm.com>
    Cc: Will Deacon <will.deacon@arm.com>
    Cc: linux-arm-kernel@lists.infradead.org
    Cc: linux-kernel@vger.kernel.org
    ---
    arch/arm64/mm/init.c | 17 +++--------------
    1 file changed, 3 insertions(+), 14 deletions(-)

    diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
    index 997c634..a398eb9 100644
    --- a/arch/arm64/mm/init.c
    +++ b/arch/arm64/mm/init.c
    @@ -197,14 +197,6 @@ void __init bootmem_init(void)
    max_pfn = max_low_pfn = max;
    }

    -/*
    - * Poison init memory with an undefined instruction (0x0).
    - */
    -static inline void poison_init_mem(void *s, size_t count)
    -{
    - memset(s, 0, count);
    -}
    -
    #ifndef CONFIG_SPARSEMEM_VMEMMAP
    static inline void free_memmap(unsigned long start_pfn, unsigned long end_pfn)
    {
    @@ -386,8 +378,7 @@ void __init mem_init(void)

    void free_initmem(void)
    {
    - poison_init_mem(__init_begin, __init_end - __init_begin);
    - free_initmem_default(-1);
    + free_initmem_default(0);
    }

    #ifdef CONFIG_BLK_DEV_INITRD
    @@ -396,10 +387,8 @@ static int keep_initrd;

    void free_initrd_mem(unsigned long start, unsigned long end)
    {
    - if (!keep_initrd) {
    - poison_init_mem((void *)start, PAGE_ALIGN(end) - start);
    - free_reserved_area((void *)start, (void *)end, -1, "initrd");
    - }
    + if (!keep_initrd)
    + free_reserved_area((void *)start, (void *)end, 0, "initrd");
    }

    static int __init keepinitrd_setup(char *__unused)
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-05-11 20:01    [W:3.937 / U:0.352 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site