aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2015-01-17 18:49:58 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2015-06-16 14:12:22 -0400
commit52252c3ed767d996a6006e5557352ab17462d1c0 (patch)
tree6fac0acdc682f66429bbaf7f9a55de4dc4d9ef96
parent01f0aa8ed71540ad958eaf0373e5c5d3b1652392 (diff)
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 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>
-rw-r--r--arch/mips/bcm47xx/prom.c2
-rw-r--r--arch/mips/include/asm/pgtable-32.h2
-rw-r--r--arch/mips/mm/tlb-r4k.c2
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)
126/* Stripped version of tlb_init, with the call to build_tlb_refill_handler 126/* Stripped version of tlb_init, with the call to build_tlb_refill_handler
127 * dropped. Calling it at this stage causes a hang. 127 * dropped. Calling it at this stage causes a hang.
128 */ 128 */
129void __cpuinit early_tlb_init(void) 129void early_tlb_init(void)
130{ 130{
131 write_c0_pagemask(PM_DEFAULT_MASK); 131 write_c0_pagemask(PM_DEFAULT_MASK);
132 write_c0_wired(0); 132 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 @@
18 18
19#include <asm-generic/pgtable-nopmd.h> 19#include <asm-generic/pgtable-nopmd.h>
20 20
21extern int temp_tlb_entry __cpuinitdata; 21extern int temp_tlb_entry;
22 22
23/* 23/*
24 * - add_temporary_entry() add a temporary TLB entry. We use TLB entries 24 * - 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 08318ecb803a..5037d5868cef 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)
423 * lifetime of the system 423 * lifetime of the system
424 */ 424 */
425 425
426int temp_tlb_entry __cpuinitdata; 426int temp_tlb_entry;
427 427
428__init int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1, 428__init int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
429 unsigned long entryhi, unsigned long pagemask) 429 unsigned long entryhi, unsigned long pagemask)