Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52252c3e authored by Paul Gortmaker's avatar Paul Gortmaker
Browse files

mips/bcm77xx: remove legacy __cpuinit sections that crept in 



We removed __cpuinit support (leaving no-op stubs) quite some time ago.
However a few more crept in as of commit 6ee1d934
("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: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent 01f0aa8e

arch/mips/bcm47xx/prom.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -126,7 +126,7 @@ void __init prom_free_prom_memory(void) 
/* Stripped version of tlb_init, with the call to build_tlb_refill_handler

/* Stripped version of tlb_init, with the call to build_tlb_refill_handler

 * dropped. Calling it at this stage causes a hang.

 * 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_pagemask(PM_DEFAULT_MASK);

	write_c0_wired(0);

	write_c0_wired(0);

arch/mips/include/asm/pgtable-32.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ 




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

#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

 * - add_temporary_entry() add a temporary TLB entry. We use TLB entries

arch/mips/mm/tlb-r4k.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -423,7 +423,7 @@ int __init has_transparent_hugepage(void) 
 * lifetime of the system

 * lifetime of the system

 */

 */





int temp_tlb_entry __cpuinitdata;

int temp_tlb_entry;





__init int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,

__init int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,

			       unsigned long entryhi, unsigned long pagemask)

			       unsigned long entryhi, unsigned long pagemask)