| Message ID | 20201006140003.10046-1-tsbogend@alpha.franken.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3e4614e7fddec8a8bafd387ca93bd368e64cae9a |
| Headers | show |
| Series | MIPS: dec: fix section mismatch | expand |
On Tue, 6 Oct 2020, Thomas Bogendoerfer wrote: > 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> Maciej
On Tue, Oct 06, 2020 at 04:00:03PM +0200, Thomas Bogendoerfer wrote: > 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> > --- > arch/mips/dec/prom/memory.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) applied to mips-next. Thomas.
diff --git a/arch/mips/dec/prom/memory.c b/arch/mips/dec/prom/memory.c index 5073d2ed78bb..df8e1af20eb7 100644 --- a/arch/mips/dec/prom/memory.c +++ b/arch/mips/dec/prom/memory.c @@ -28,7 +28,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]; @@ -58,7 +58,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;
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> --- arch/mips/dec/prom/memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)