Commit 666e81fd authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

sections: fix section conflicts in arch/sh 



Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 458fe425

arch/sh/include/asm/io.h

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ __BUILD_MEMORY_STRING(__raw_, q, u64) 
 * load/store instructions. sh_io_port_base is the virtual address to

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

{

arch/sh/kernel/ioport.c

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include <linux/module.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);



void __iomem *__ioport_map(unsigned long addr, unsigned int size)