diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 12:43:05 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 12:43:05 +0100 |
| commit | 81444a799550214f549caf579cf65a0ca55e70b7 (patch) | |
| tree | 3288dac0740be2e1e7d1af4ee51d792a6e91edf3 /arch/mn10300 | |
| parent | a64d31baed104be25305e9c71585d3ea4ee9a418 (diff) | |
| parent | da485e0cb16726797e99a595a399b9fc721b91bc (diff) | |
| download | op-kernel-dev-81444a799550214f549caf579cf65a0ca55e70b7.zip op-kernel-dev-81444a799550214f549caf579cf65a0ca55e70b7.tar.gz | |
Merge branch 'tracing/fastboot' into cpus4096
Diffstat (limited to 'arch/mn10300')
| -rw-r--r-- | arch/mn10300/kernel/module.c | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/arch/mn10300/kernel/module.c b/arch/mn10300/kernel/module.c index 8fa3689..6b287f2 100644 --- a/arch/mn10300/kernel/module.c +++ b/arch/mn10300/kernel/module.c @@ -1,6 +1,6 @@ /* MN10300 Kernel module helper routines * - * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. + * Copyright (C) 2007, 2008 Red Hat, Inc. All Rights Reserved. * Written by Mark Salter (msalter@redhat.com) * - Derived from arch/i386/kernel/module.c * @@ -64,21 +64,6 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, return 0; } -static uint32_t reloc_get16(uint8_t *p) -{ - return p[0] | (p[1] << 8); -} - -static uint32_t reloc_get24(uint8_t *p) -{ - return reloc_get16(p) | (p[2] << 16); -} - -static uint32_t reloc_get32(uint8_t *p) -{ - return reloc_get16(p) | (reloc_get16(p+2) << 16); -} - static void reloc_put16(uint8_t *p, uint32_t val) { p[0] = val & 0xff; @@ -144,25 +129,19 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, relocation = sym->st_value + rel[i].r_addend; switch (ELF32_R_TYPE(rel[i].r_info)) { - /* for the first four relocation types, we add the - * adjustment into the value at the location given */ + /* for the first four relocation types, we simply + * store the adjustment at the location given */ case R_MN10300_32: - value = reloc_get32(location); - value += relocation; - reloc_put32(location, value); + reloc_put32(location, relocation); break; case R_MN10300_24: - value = reloc_get24(location); - value += relocation; - reloc_put24(location, value); + reloc_put24(location, relocation); break; case R_MN10300_16: - value = reloc_get16(location); - value += relocation; - reloc_put16(location, value); + reloc_put16(location, relocation); break; case R_MN10300_8: - *location += relocation; + *location = relocation; break; /* for the next three relocation types, we write the |
