Commit d18c7e9d authored by Linus Torvalds's avatar Linus Torvalds

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
parents 33de0d1c adefd051
...@@ -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