Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[pandora-kernel.git] / arch / powerpc / kernel / vdso.c

diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index f7ec7d0..ad06d5c 100644 (file)
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -566,6 +566,11 @@ static __init int vdso_fixup_features(struct lib32_elfinfo *v32,
                do_feature_fixups(cur_cpu_spec->cpu_features,
                                  start64, start64 + size64);
 
+       start64 = find_section64(v64->hdr, "__mmu_ftr_fixup", &size64);
+       if (start64)
+               do_feature_fixups(cur_cpu_spec->mmu_features,
+                                 start64, start64 + size64);
+
        start64 = find_section64(v64->hdr, "__fw_ftr_fixup", &size64);
        if (start64)
                do_feature_fixups(powerpc_firmware_features,
@@ -582,6 +587,11 @@ static __init int vdso_fixup_features(struct lib32_elfinfo *v32,
                do_feature_fixups(cur_cpu_spec->cpu_features,
                                  start32, start32 + size32);
 
+       start32 = find_section32(v32->hdr, "__mmu_ftr_fixup", &size32);
+       if (start32)
+               do_feature_fixups(cur_cpu_spec->mmu_features,
+                                 start32, start32 + size32);
+
 #ifdef CONFIG_PPC64
        start32 = find_section32(v32->hdr, "__fw_ftr_fixup", &size32);
        if (start32)