Skip to content

Commit

Permalink
MIPS: BCM77xx: Remove legacy __cpuinit{,data} sections that crept in
Browse files Browse the repository at this point in the history
We removed __cpuinit support (leaving no-op stubs) quite some time ago.
However a few more crept in as of commit 6ee1d93
("MIPS: BCM47XX: Detect more then 128 MiB of RAM (HIGHMEM)")

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

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Rafał Miłecki <zajec5@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/9892/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Paul Gortmaker authored and Ralf Baechle committed Jun 21, 2015
1 parent 361d0f7 commit b1f7e11
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion arch/mips/bcm47xx/prom.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/include/asm/pgtable-32.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/mm/tlb-r4k.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit b1f7e11

Please sign in to comment.