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

1 files changed, 2 insertions, 4 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;