lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sections: fix section conflicts in arch/sh

Browse Source 
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andi Kleen
2012-10-04 17:11:41 -07:00
committed by Linus Torvalds
parent 458fe42529
commit 666e81fdca
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sh/include/asm/io.h
View File

@@ -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)
{ {

2
arch/sh/kernel/ioport.c
View File

@@ -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)