summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-06-07 13:06:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-06-07 13:06:00 -0700
commitd18c7e9d6e4e0ba358459e812bf115b4ccef54ce (patch)
tree404a4c87088caac4530b4997f6f8774d49656876
parent33de0d1c68a5127e923363349c349d90c7da06a1 (diff)
parentadefd051a6707a6ca0ebad278d3c1c05c960fc3b (diff)
downloadlwn-d18c7e9d6e4e0ba358459e812bf115b4ccef54ce.tar.gz
lwn-d18c7e9d6e4e0ba358459e812bf115b4ccef54ce.zip
Merge tag 'xtensa-20190607' of git://github.com/jcmvbkbc/linux-xtensa
Pull xtensa fix from Max Filippov: "Fix a section mismatch between memblock_reserve and mem_reserve. This fixes tinyconfig xtensa builds" * tag 'xtensa-20190607' of git://github.com/jcmvbkbc/linux-xtensa: xtensa: Fix section mismatch between memblock_reserve and mem_reserve
-rw-r--r--arch/xtensa/kernel/setup.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c
index c0ec24349421..176cb46bcf12 100644
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@ -310,7 +310,8 @@ extern char _SecondaryResetVector_text_start;
extern char _SecondaryResetVector_text_end;
#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);
}