diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-05-22 00:29:37 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-05-22 00:29:37 -0400 |
| commit | 5f8371cec93b94a24a55ba1de642ce6eade6d62c (patch) | |
| tree | 61b6d2acb10226b3c0f2d31bda3a49288e540eba /arch/sh/kernel/module.c | |
| parent | 8e9bb19ef97d6594e735bee64b6d72103e350854 (diff) | |
| parent | d8586ba6e1415150e1bab89f0a05447bb6f2d6d5 (diff) | |
Merge branches 'sh/stable-updates' and 'sh/sparseirq'
Diffstat (limited to 'arch/sh/kernel/module.c')
| -rw-r--r-- | arch/sh/kernel/module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/module.c b/arch/sh/kernel/module.c index c43081039dd5..c19b0f7d2cc1 100644 --- a/arch/sh/kernel/module.c +++ b/arch/sh/kernel/module.c | |||
| @@ -90,7 +90,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, | |||
| 90 | * SHmedia, the LSB of the symbol needs to be asserted | 90 | * SHmedia, the LSB of the symbol needs to be asserted |
| 91 | * for the CPU to be in SHmedia mode when it starts executing | 91 | * for the CPU to be in SHmedia mode when it starts executing |
| 92 | * the branch target. */ | 92 | * the branch target. */ |
| 93 | relocation |= (sym->st_other & 4); | 93 | relocation |= !!(sym->st_other & 4); |
| 94 | #endif | 94 | #endif |
| 95 | 95 | ||
| 96 | switch (ELF32_R_TYPE(rel[i].r_info)) { | 96 | switch (ELF32_R_TYPE(rel[i].r_info)) { |