diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-10 17:37:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-10 17:37:17 -0700 |
| commit | 068ef739127af1faf6f342b56d41ceea89f76c75 (patch) | |
| tree | 1ce4cddcd4d4b6b4e3bf539e40e14f2ac3fb5c91 /arch/arm/kernel | |
| parent | a0c49b6b6729723f32208acb59946d29c72539c6 (diff) | |
| parent | 4eb979d4d182c67acb6272a3a0244bf0027cf16b (diff) | |
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: drop experimental status for ARM_PATCH_PHYS_VIRT
ARM: 7008/1: alignment: Make SIGBUS sent to userspace POSIXly correct
ARM: 7007/1: alignment: Prevent ignoring of faults with ARMv6 unaligned access model
ARM: 7010/1: mm: fix invalid loop for poison_init_mem
ARM: 7005/1: freshen up mm/proc-arm946.S
dmaengine: PL08x: Fix trivial build error
ARM: Fix build error for SMP=n builds
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/module.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c index 05b377616fd..cc2020c2c70 100644 --- a/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c @@ -323,7 +323,11 @@ int module_finalize(const Elf32_Ehdr *hdr, const Elf_Shdr *sechdrs, #endif s = find_mod_section(hdr, sechdrs, ".alt.smp.init"); if (s && !is_smp()) +#ifdef CONFIG_SMP_ON_UP fixup_smp((void *)s->sh_addr, s->sh_size); +#else + return -EINVAL; +#endif return 0; } |