Merge commit 'v2.6.36-rc7' into perf/core

[net-next-2.6.git] / arch / x86 / kernel / module.c

diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
index 1c355c550960ab75279c644b52269cd5a368239a..8f295609173524cdf06a20c6c0ad4fbe1de12263 100644 (file)
--- a/arch/x86/kernel/module.c
+++ b/arch/x86/kernel/module.c
@@ -239,6 +239,9 @@ int module_finalize(const Elf_Ehdr *hdr,
                apply_paravirt(pseg, pseg + para->sh_size);
        }
 
+       /* make jump label nops */
+       jump_label_apply_nops(me);
+
        return 0;
 }