aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/dec
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tsbogend@alpha.franken.de>2020-10-06 16:00:03 +0200
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>2020-10-14 23:54:28 +0200
commit3e4614e7fddec8a8bafd387ca93bd368e64cae9a (patch)
treeb5dcd3a3d23447c9eac5acc72549cd19a57815ba /arch/mips/dec
parentbcm963xx_tag.h: fix duplicated word (diff)
downloadlinux-3e4614e7fddec8a8bafd387ca93bd368e64cae9a.tar.gz
linux-3e4614e7fddec8a8bafd387ca93bd368e64cae9a.zip
MIPS: dec: fix section mismatch
Drop inline for memory setup functions and mark them __init to fix section mismatch of pmax_setup_memory_region. Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Acked-by: Maciej W. Rozycki <macro@linux-mips.org>
Diffstat (limited to 'arch/mips/dec')
-rw-r--r--arch/mips/dec/prom/memory.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/dec/prom/memory.c b/arch/mips/dec/prom/memory.c
index 288772c3eb0c..44490c30d63b 100644
--- a/arch/mips/dec/prom/memory.c
+++ b/arch/mips/dec/prom/memory.c
@@ -27,7 +27,7 @@ volatile unsigned long mem_err; /* So we know an error occurred */
#define CHUNK_SIZE 0x400000
-static inline void pmax_setup_memory_region(void)
+static __init void pmax_setup_memory_region(void)
{
volatile unsigned char *memory_page, dummy;
char old_handler[0x80];
@@ -56,7 +56,7 @@ static inline void pmax_setup_memory_region(void)
* Use the REX prom calls to get hold of the memory bitmap, and thence
* determine memory size.
*/
-static inline void rex_setup_memory_region(void)
+static __init void rex_setup_memory_region(void)
{
int i, bitmap_size;
unsigned long mem_start = 0, mem_size = 0;
td>2018-11-03ocfs2: without quota support, avoid calling quota recoveryGuozhonghua1-17/+34 2018-11-03ocfs2: remove ocfs2_is_o2cb_active()Gang He3-10/+1 2018-11-03mm: thp: relax __GFP_THISNODE for MADV_HUGEPAGE mappingsAndrea Arcangeli1-2/+30 2018-11-03include/linux/notifier.h: SRCU: fix ctagsSam Protsenko1-2/+1 2018-11-03mm: handle no memcg case in memcg_kmem_charge() properlyRoman Gushchin1-1/+1 2018-11-02ARM: dts: stm32: update HASH1 dmas property on stm32mp157cAlexandre Torgue1-1/+1 2018-11-02ARM: orion: avoid VLA in orion_mpp_confArnd Bergmann1-1/+6 2018-11-02iov_iter: Fix 9p virtio breakageMarc Zyngier1-1/+1 2018-11-02cifs: fix signed/unsigned mismatch on aio_read patchSteve French1-6/+11 2018-11-02cifs: don't dereference smb_file_target before null checkColin Ian King1-2/+5 2018-11-02CIFS: Add direct I/O functions to file_operationsLong Li1-6/+4 2018-11-02CIFS: Add support for direct I/O writeLong Li2-41/+164 2018-11-02CIFS: Add support for direct I/O readLong Li3-39/+192 2018-11-02smb3: missing defines and structs for reparse point handlingSteve French2-0/+38 2018-11-02smb3: allow more detailed protocol info on open files for debuggingSteve French4-0/+65 2018-11-02smb3: on kerberos mount if server doesn't specify auth type use krb5Steve French1-2/+4 2018-11-02smb3: add trace point for tree connectionSteve French2-1/+44 2018-11-02cifs: fix spelling mistake, EACCESS -> EACCESColin Ian King2-3/+3 2018-11-02cifs: fix return value for cifs_listxattrRonnie Sahlberg1-5/+6