git.openwrt.org Git - openwrt/svn-archive/openwrt.git/blob

   1 From 50d68dfef385127a1da2957813272c610c691157 Mon Sep 17 00:00:00 2001
   2 From: Paul Gortmaker <paul.gortmaker@windriver.com>
   3 Date: Mon, 27 Apr 2015 18:47:56 -0400
   4 Subject: [PATCH] MIPS: BCM77xx: Remove legacy __cpuinit{,data} sections that
   5  crept in
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 We removed __cpuinit support (leaving no-op stubs) quite some time ago.
  11 However a few more crept in as of commit 6ee1d93455384cef8a0426effe85da2
  12 ("MIPS: BCM47XX: Detect more then 128 MiB of RAM (HIGHMEM)")
  13
  14 Since we want to clobber the stubs soon, get this removed now.
  15
  16 Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
  17 Cc: Rafał Miłecki <zajec5@gmail.com>
  18 Cc: linux-mips@linux-mips.org
  19 Cc: linux-kernel@vger.kernel.org
  20 Patchwork: https://patchwork.linux-mips.org/patch/9892/
  21 Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  22 ---
  23  arch/mips/bcm47xx/prom.c           | 2 +-
  24  arch/mips/include/asm/pgtable-32.h | 2 +-
  25  arch/mips/mm/tlb-r4k.c             | 2 +-
  26  3 files changed, 3 insertions(+), 3 deletions(-)
  27
  28 --- a/arch/mips/bcm47xx/prom.c
  29 +++ b/arch/mips/bcm47xx/prom.c
  30 @@ -126,7 +126,7 @@ void __init prom_free_prom_memory(void)
  31  /* Stripped version of tlb_init, with the call to build_tlb_refill_handler
  32   * dropped. Calling it at this stage causes a hang.
  33   */
  34 -void __cpuinit early_tlb_init(void)
  35 +void early_tlb_init(void)
  36  {
  37         write_c0_pagemask(PM_DEFAULT_MASK);
  38         write_c0_wired(0);
  39 --- a/arch/mips/include/asm/pgtable-32.h
  40 +++ b/arch/mips/include/asm/pgtable-32.h
  41 @@ -18,7 +18,7 @@
  42
  43  #include <asm-generic/pgtable-nopmd.h>
  44
  45 -extern int temp_tlb_entry __cpuinitdata;
  46 +extern int temp_tlb_entry;
  47
  48  /*
  49   * - add_temporary_entry() add a temporary TLB entry. We use TLB entries
  50 --- a/arch/mips/mm/tlb-r4k.c
  51 +++ b/arch/mips/mm/tlb-r4k.c
  52 @@ -411,7 +411,7 @@ int __init has_transparent_hugepage(void
  53   * lifetime of the system
  54   */
  55
  56 -int temp_tlb_entry __cpuinitdata;
  57 +int temp_tlb_entry;
  58
  59  __init int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
  60                                unsigned long entryhi, unsigned long pagemask)