2020-10-06 14:03:02

by Thomas Bogendoerfer

Subject: [PATCH] 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 <[email protected]>
---
arch/mips/dec/prom/memory.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

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;
--
2.16.4

2020-10-14 16:20:23

by Maciej W. Rozycki

Subject: Re: [PATCH] MIPS: dec: fix section mismatch

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 <[email protected]>

Acked-by: Maciej W. Rozycki <[email protected]>

Maciej

2020-10-15 07:23:15

by Thomas Bogendoerfer

Subject: Re: [PATCH] MIPS: dec: fix section mismatch

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 <[email protected]>
> ---
> arch/mips/dec/prom/memory.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

applied to mips-next.

Thomas.

--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]