Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 6 insertions, 0 deletions

diff --git a/arch/powerpc/kernel/module.c b/arch/powerpc/kernel/module.c
index 7ff292475269..43e7e3a7f130 100644
--- a/arch/powerpc/kernel/module.c
+++ b/arch/powerpc/kernel/module.c
@@ -78,6 +78,12 @@ int module_finalize(const Elf_Ehdr *hdr,
                                   (void *)sect->sh_addr,
                                   (void *)sect->sh_addr + sect->sh_size);
 
+        sect = find_section(hdr, sechdrs, "__mmu_ftr_fixup");
+        if (sect != NULL)
+                do_feature_fixups(cur_cpu_spec->mmu_features,
+                                  (void *)sect->sh_addr,
+                                  (void *)sect->sh_addr + sect->sh_size);
+
 #ifdef CONFIG_PPC64
         sect = find_section(hdr, sechdrs, "__fw_ftr_fixup");
         if (sect != NULL)