diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-09-24 09:12:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-24 09:12:05 +0200 |
| commit | a5a2bad55de89a0adf7d6f783cb87ab7eb1a894f (patch) | |
| tree | 452cb8addc26f5c79fdd4e2fea92c78dc17fc8e8 /arch/x86/kernel/module.c | |
| parent | Merge branch 'linus' into perf/core (diff) | |
| parent | jump label/x86/sparc64: Remove !CC_OPTIMIZE_FOR_SIZE config conditions (diff) | |
| download | linux-a5a2bad55de89a0adf7d6f783cb87ab7eb1a894f.tar.xz linux-a5a2bad55de89a0adf7d6f783cb87ab7eb1a894f.zip | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'arch/x86/kernel/module.c')
| -rw-r--r-- | arch/x86/kernel/module.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c index e0bc186d7501..5399f58de7ed 100644 --- 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 module_bug_finalize(hdr, sechdrs, me); } |