1 files changed, 6 insertions, 28 deletions

diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
index 016d6a0830a..09326b62780 100644
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
@@ -43,25 +43,7 @@ void *module_alloc(unsigned long size)
                                 GFP_KERNEL, PAGE_KERNEL_EXEC, -1,
                                 __builtin_return_address(0));
 }
-#else /* CONFIG_MMU */
-void *module_alloc(unsigned long size)
-{
-        return size == 0 ? NULL : vmalloc(size);
-}
-#endif /* !CONFIG_MMU */
-
-void module_free(struct module *module, void *region)
-{
-        vfree(region);
-}
-
-int module_frob_arch_sections(Elf_Ehdr *hdr,
-                              Elf_Shdr *sechdrs,
-                              char *secstrings,
-                              struct module *mod)
-{
-        return 0;
-}
+#endif
 
 int
 apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
@@ -107,6 +89,7 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
                         break;
 
                 case R_ARM_ABS32:
+                case R_ARM_TARGET1:
                         *(u32 *)loc += sym->st_value;
                         break;
 
@@ -265,15 +248,6 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
         return 0;
 }
 
-int
-apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,
-                   unsigned int symindex, unsigned int relsec, struct module *module)
-{
-        printk(KERN_ERR "module %s: ADD RELOCATION unsupported\n",
-               module->name);
-        return -ENOEXEC;
-}
-
 struct mod_unwind_map {
         const Elf_Shdr *unw_sec;
         const Elf_Shdr *txt_sec;
@@ -350,7 +324,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;
 }