summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Stone <ahs3@redhat.com>2013-01-17 09:29:14 -0700
committerTushar Behera <tushar.behera@linaro.org>2013-01-22 12:04:38 +0530
commit79668624e15d91a3b40143208cc884d8270942db (patch)
treea4c254296e23141984ecf11672d6aa72b002046f
parentf8ca0fc7fdb398305b8dbcf61b535452de8fa1bc (diff)
downloadlinux-topics-tracking-samslt-all-ll-20130122.1.tar.gz
ARM: Fix compile error if CONFIG_ARM_UNWIND is not definedtracking-samslt-all-ll-20130122.1tracking-samslt-all-ll-20130122.0samsung-lt-v3.8-rc4
If CONFIG_ARM_UNWIND is not set for some reason, module_finalize() will not compile due to a missing declaration for 'err'. Moved the declaration outside of an #ifdef so that the code will compile regardless of the value of CONFIG_ARM_UNWIND. Signed-off-by: Al Stone <ahs3@redhat.com> Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
-rw-r--r--arch/arm/kernel/module.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
index 021a940638f..bd8a860422a 100644
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
@@ -273,11 +273,12 @@ int module_finalize(const Elf32_Ehdr *hdr, const Elf_Shdr *sechdrs,
struct module *mod)
{
const Elf_Shdr *s = NULL;
+ int err;
#ifdef CONFIG_ARM_UNWIND
const char *secstrs = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
const Elf_Shdr *sechdrs_end = sechdrs + hdr->e_shnum;
struct mod_unwind_map maps[ARM_SEC_MAX];
- int i, err;
+ int i;
memset(maps, 0, sizeof(maps));