提交 666e81fd 编写于 作者: A Andi Kleen 提交者: Linus Torvalds

sections: fix section conflicts in arch/sh

Signed-off-by: NAndi Kleen <ak@linux.intel.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 458fe425
...@@ -134,7 +134,7 @@ __BUILD_MEMORY_STRING(__raw_, q, u64) ...@@ -134,7 +134,7 @@ __BUILD_MEMORY_STRING(__raw_, q, u64)
* load/store instructions. sh_io_port_base is the virtual address to * load/store instructions. sh_io_port_base is the virtual address to
* which all ports are being mapped. * which all ports are being mapped.
*/ */
extern const unsigned long sh_io_port_base; extern unsigned long sh_io_port_base;
static inline void __set_io_port_base(unsigned long pbase) static inline void __set_io_port_base(unsigned long pbase)
{ {
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/io.h> #include <linux/io.h>
const unsigned long sh_io_port_base __read_mostly = -1; unsigned long sh_io_port_base __read_mostly = -1;
EXPORT_SYMBOL(sh_io_port_base); EXPORT_SYMBOL(sh_io_port_base);
void __iomem *__ioport_map(unsigned long addr, unsigned int size) void __iomem *__ioport_map(unsigned long addr, unsigned int size)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册