diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-10-12 17:14:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-10-12 17:14:47 +0200 |
| commit | 910e94dd0cc5abacebf0bd5ffd859f61b9583857 (patch) | |
| tree | 7cb33f3f89f5fcdaa4dd4f5f19bb946ff495e9ac /arch/x86/kernel | |
| parent | 177e2163fe2a5951c1d0531baa4bc1f135c6b7b4 (diff) | |
| parent | d696b58ca2c3ca76e784ef89a7e0453d9b7ab187 (diff) | |
Merge branch 'tip/perf/core' of git://github.com/rostedt/linux into perf/core
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/jump_label.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c index 3fee346ef545..cacdd46d184d 100644 --- a/arch/x86/kernel/jump_label.c +++ b/arch/x86/kernel/jump_label.c @@ -42,7 +42,7 @@ void arch_jump_label_transform(struct jump_entry *entry, put_online_cpus(); } -void arch_jump_label_text_poke_early(jump_label_t addr) +void __init_or_module arch_jump_label_text_poke_early(jump_label_t addr) { text_poke_early((void *)addr, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE); |