Merge tag 'for-3.13' of git://git.openrisc.net/~jonas/linux

Pull OpenRISC updates from Jonas Bonn:
 - small cleanups to make allmodconfig pass
 - defconfig refresh
 - a handful of code sanitization patches

* tag 'for-3.13' of git://git.openrisc.net/~jonas/linux:
  openrisc: Refactor or32_early_setup()
  openrisc: Remove unused declaration of __initramfs_start
  openrisc: Use the declarations provided by <asm/sections.h>
  openrisc: Refresh or1ksim_defconfig for v3.12
  openrisc: Refactor 16-bit constant relocation
  openrisc: include: asm: Kbuild: add default "vga.h"
  openrisc: Makefile: append "-D__linux__" to KBUILD_CFLAGS

3 files changed, 15 insertions, 18 deletions

diff --git a/arch/openrisc/kernel/module.c b/arch/openrisc/kernel/module.c
index 10ff50f0202a..ef872ae4c878 100644
--- a/arch/openrisc/kernel/module.c
+++ b/arch/openrisc/kernel/module.c
@@ -47,12 +47,10 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
                         *location = value;
                         break;
                 case R_OR32_CONST:
-                        location = (uint16_t *)location + 1;
-                        *((uint16_t *)location) = (uint16_t) (value);
+                        *((uint16_t *)location + 1) = value;
                         break;
                 case R_OR32_CONSTH:
-                        location = (uint16_t *)location + 1;
-                        *((uint16_t *)location) = (uint16_t) (value >> 16);
+                        *((uint16_t *)location + 1) = value >> 16;
                         break;
                 case R_OR32_JUMPTARG:
                         value -= (uint32_t)location;
diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c
index 09a769b69572..4fc7ccc0a2cf 100644
--- a/arch/openrisc/kernel/setup.c
+++ b/arch/openrisc/kernel/setup.c
@@ -40,6 +40,7 @@
 #include <linux/device.h>
 #include <linux/of_platform.h>
 
+#include <asm/sections.h>
 #include <asm/segment.h>
 #include <asm/pgtable.h>
 #include <asm/types.h>
@@ -75,7 +76,7 @@ static unsigned long __init setup_memory(void)
 
         ram_start_pfn = PFN_UP(memory_start);
         /* free_ram_start_pfn is first page after kernel */
-        free_ram_start_pfn = PFN_UP(__pa(&_end));
+        free_ram_start_pfn = PFN_UP(__pa(_end));
         ram_end_pfn = PFN_DOWN(memblock_end_of_DRAM());
 
         max_pfn = ram_end_pfn;
@@ -207,15 +208,15 @@ void __init setup_cpuinfo(void)
  * Falls back on built-in device tree in case null pointer is passed.
  */
 
-void __init or32_early_setup(unsigned int fdt)
+void __init or32_early_setup(void *fdt)
 {
-        if (fdt) {
-                early_init_devtree((void*) fdt);
-                printk(KERN_INFO "FDT at 0x%08x\n", fdt);
-        } else {
-                early_init_devtree(__dtb_start);
-                printk(KERN_INFO "Compiled-in FDT at %p\n", __dtb_start);
+        if (fdt)
+                pr_info("FDT at %p\n", fdt);
+        else {
+                fdt = __dtb_start;
+                pr_info("Compiled-in FDT at %p\n", fdt);
         }
+        early_init_devtree(fdt);
 }
 
 static int __init openrisc_device_probe(void)
@@ -288,10 +289,10 @@ void __init setup_arch(char **cmdline_p)
         setup_cpuinfo();
 
         /* process 1's initial memory region is the kernel code/data */
-        init_mm.start_code = (unsigned long)&_stext;
-        init_mm.end_code = (unsigned long)&_etext;
-        init_mm.end_data = (unsigned long)&_edata;
-        init_mm.brk = (unsigned long)&_end;
+        init_mm.start_code = (unsigned long)_stext;
+        init_mm.end_code = (unsigned long)_etext;
+        init_mm.end_data = (unsigned long)_edata;
+        init_mm.brk = (unsigned long)_end;
 
 #ifdef CONFIG_BLK_DEV_INITRD
         initrd_start = (unsigned long)&__initrd_start;
diff --git a/arch/openrisc/kernel/vmlinux.h b/arch/openrisc/kernel/vmlinux.h
index ee842a2d3f36..70b9ce41835c 100644
--- a/arch/openrisc/kernel/vmlinux.h
+++ b/arch/openrisc/kernel/vmlinux.h
@@ -1,10 +1,8 @@
 #ifndef __OPENRISC_VMLINUX_H_
 #define __OPENRISC_VMLINUX_H_
 
-extern char _stext, _etext, _edata, _end;
 #ifdef CONFIG_BLK_DEV_INITRD
 extern char __initrd_start, __initrd_end;
-extern char __initramfs_start;
 #endif
 
 extern u32 __dtb_start[];