sections: fix section conflicts in arch/sh

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Andi Kleen and committed by

Linus Torvalds 13 years ago 666e81fd 458fe425

+2 -2

2 changed files

expand all

arch

include

asm

io.h

kernel

ioport.c

+1 -1

arch/sh/include/asm/io.h

··· 134 134 * load/store instructions. sh_io_port_base is the virtual address to 135 135 * which all ports are being mapped. 136 136 */ 137 - extern const unsigned long sh_io_port_base; 137 + extern unsigned long sh_io_port_base; 138 138 139 139 static inline void __set_io_port_base(unsigned long pbase) 140 140 {

+1 -1

arch/sh/kernel/ioport.c

··· 11 11 #include <linux/module.h> 12 12 #include <linux/io.h> 13 13 14 - const unsigned long sh_io_port_base __read_mostly = -1; 14 + unsigned long sh_io_port_base __read_mostly = -1; 15 15 EXPORT_SYMBOL(sh_io_port_base); 16 16 17 17 void __iomem *__ioport_map(unsigned long addr, unsigned int size)