lkml.org 
[lkml]   [2015]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/11] mips/bcm77xx: remove legacy __cpuinit sections that crept in
    Date
    We removed __cpuinit support (leaving no-op stubs) quite some time ago.
    However a few more crept in as of commit 6ee1d93455384cef8a0426effe85da2
    ("MIPS: BCM47XX: Detect more then 128 MiB of RAM (HIGHMEM)")

    Since we want to clobber the stubs soon, get this removed now.

    Cc: Rafał Miłecki <zajec5@gmail.com>
    Cc: linux-mips@linux-mips.org
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    arch/mips/bcm47xx/prom.c | 2 +-
    arch/mips/include/asm/pgtable-32.h | 2 +-
    arch/mips/mm/tlb-r4k.c | 2 +-
    3 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/mips/bcm47xx/prom.c b/arch/mips/bcm47xx/prom.c
    index ab698bad6d62..135a5407f015 100644
    --- a/arch/mips/bcm47xx/prom.c
    +++ b/arch/mips/bcm47xx/prom.c
    @@ -126,7 +126,7 @@ void __init prom_free_prom_memory(void)
    /* Stripped version of tlb_init, with the call to build_tlb_refill_handler
    * dropped. Calling it at this stage causes a hang.
    */
    -void __cpuinit early_tlb_init(void)
    +void early_tlb_init(void)
    {
    write_c0_pagemask(PM_DEFAULT_MASK);
    write_c0_wired(0);
    diff --git a/arch/mips/include/asm/pgtable-32.h b/arch/mips/include/asm/pgtable-32.h
    index 7d56686c0e62..832e2167d00f 100644
    --- a/arch/mips/include/asm/pgtable-32.h
    +++ b/arch/mips/include/asm/pgtable-32.h
    @@ -18,7 +18,7 @@

    #include <asm-generic/pgtable-nopmd.h>

    -extern int temp_tlb_entry __cpuinitdata;
    +extern int temp_tlb_entry;

    /*
    * - add_temporary_entry() add a temporary TLB entry. We use TLB entries
    diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
    index a27a088e6f9f..440cbf3d6ab9 100644
    --- a/arch/mips/mm/tlb-r4k.c
    +++ b/arch/mips/mm/tlb-r4k.c
    @@ -423,7 +423,7 @@ int __init has_transparent_hugepage(void)
    * lifetime of the system
    */

    -int temp_tlb_entry __cpuinitdata;
    +int temp_tlb_entry;

    __init int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
    unsigned long entryhi, unsigned long pagemask)
    --
    2.2.1


    \
     
     \ /
      Last update: 2015-04-28 01:21    [W:3.236 / U:0.392 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site