diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 14:26:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 14:26:38 -0800 |
| commit | 98d38dd2ee30322fc9934d7490be3c5bee80950e (patch) | |
| tree | a65a3ccb525156f1dd5ffdc7286eddcfd33d3c5e /arch/openrisc/kernel/module.c | |
| parent | e4528d696f0fbb8eda231e2696b9ce0660f1e814 (diff) | |
| parent | 621c2cd853fca98258b720d9fe7e8c031ec7f96f (diff) | |
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
Diffstat (limited to 'arch/openrisc/kernel/module.c')
| -rw-r--r-- | arch/openrisc/kernel/module.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/openrisc/kernel/module.c b/arch/openrisc/kernel/module.c index 10ff50f0202..ef872ae4c87 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; |