sections: fix section conflicts in arch/sh
authorAndi Kleen <ak@linux.intel.com>
Fri, 5 Oct 2012 00:11:41 +0000 (17:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Oct 2012 18:04:40 +0000 (03:04 +0900)
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>
arch/sh/include/asm/io.h
arch/sh/kernel/ioport.c

index 0cf60a62881435559ddec1d1c930ba2d71298a5c..73a23f4617a37c5a5270d5bc50d9689af45d8f89 100644 (file)
@@ -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)
 {
index e3ad6103e7c181ba955b2c9967a41a8a61659eb7..cca14ba84a379fea07bb74ddaabb02bb062cd649 100644 (file)
@@ -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)