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/sparc/kernel/module.c | |
| parent | d0303d71c2fb9bcb90a8d48e6462c78c86f70ce6 (diff) | |
| parent | 46eb3b64dddd20f44e76b08676fa642dd374bf1d (diff) | |
| download | kernel_samsung_smdk4412-a5a2bad55de89a0adf7d6f783cb87ab7eb1a894f.zip kernel_samsung_smdk4412-a5a2bad55de89a0adf7d6f783cb87ab7eb1a894f.tar.gz kernel_samsung_smdk4412-a5a2bad55de89a0adf7d6f783cb87ab7eb1a894f.tar.bz2 | |
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/sparc/kernel/module.c')
| -rw-r--r-- | arch/sparc/kernel/module.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/sparc/kernel/module.c b/arch/sparc/kernel/module.c index f848aad..ee3c7dd 100644 --- a/arch/sparc/kernel/module.c +++ b/arch/sparc/kernel/module.c @@ -18,6 +18,9 @@ #include <asm/spitfire.h> #ifdef CONFIG_SPARC64 + +#include <linux/jump_label.h> + static void *module_map(unsigned long size) { struct vm_struct *area; @@ -227,6 +230,9 @@ int module_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, struct module *me) { + /* make jump label nops */ + jump_label_apply_nops(me); + /* Cheetah's I-cache is fully coherent. */ if (tlb_type == spitfire) { unsigned long va; |