Commit 5eb93bd2 authored by Guenter Roeck's avatar Guenter Roeck Committed by Greg Kroah-Hartman

xtensa: Fix section mismatch between memblock_reserve and mem_reserve

[ Upstream commit adefd051 ]

Since commit 9012d011 ("compiler: allow all arches to enable
CONFIG_OPTIMIZE_INLINING"), xtensa:tinyconfig fails to build with section
mismatch errors.

WARNING: vmlinux.o(.text.unlikely+0x68): Section mismatch in reference
	from the function ___pa()
	to the function .meminit.text:memblock_reserve()
WARNING: vmlinux.o(.text.unlikely+0x74): Section mismatch in reference
	from the function mem_reserve()
	to the function .meminit.text:memblock_reserve()
FATAL: modpost: Section mismatches detected.

This was not seen prior to the above mentioned commit because mem_reserve()
was always inlined.

Mark mem_reserve(() as __init_memblock to have it reside in the same
section as memblock_reserve().
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Message-Id: <1559220098-9955-1-git-send-email-linux@roeck-us.net>
Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7348616e
...@@ -310,7 +310,8 @@ extern char _SecondaryResetVector_text_start; ...@@ -310,7 +310,8 @@ extern char _SecondaryResetVector_text_start;
extern char _SecondaryResetVector_text_end; extern char _SecondaryResetVector_text_end;
#endif #endif
static inline int mem_reserve(unsigned long start, unsigned long end) static inline int __init_memblock mem_reserve(unsigned long start,
unsigned long end)
{ {
return memblock_reserve(start, end - start); return memblock_reserve(start, end - start);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment