From 01e522e4794aa09cd191e16efca843eab22a5208 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Tue, 6 Dec 2011 17:27:29 +0100 Subject: [PATCH] --- yaml --- r: 277323 b: refs/heads/master c: 9cdbe1cbac4ec318037297175587a0080acc9d11 h: refs/heads/master i: 277321: 1cfcdff4600f5d235c804f1f6e4ac6e4dee56867 277319: 3d4ce2602f1239f575cad1ac8bcfda0d631b14bb v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/jump_label.c | 2 +- trunk/kernel/jump_label.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 839401634a9f..2773ff745749 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc991b83b3eb11b253dd932932fa0bfd09c7564a +refs/heads/master: 9cdbe1cbac4ec318037297175587a0080acc9d11 diff --git a/trunk/arch/x86/kernel/jump_label.c b/trunk/arch/x86/kernel/jump_label.c index ea9d5f2f13ef..2889b3d43882 100644 --- a/trunk/arch/x86/kernel/jump_label.c +++ b/trunk/arch/x86/kernel/jump_label.c @@ -50,7 +50,7 @@ void arch_jump_label_transform(struct jump_entry *entry, put_online_cpus(); } -void arch_jump_label_transform_static(struct jump_entry *entry, +__init_or_module void arch_jump_label_transform_static(struct jump_entry *entry, enum jump_label_type type) { __jump_label_transform(entry, type, text_poke_early); diff --git a/trunk/kernel/jump_label.c b/trunk/kernel/jump_label.c index 51a175ab0a03..3fb7b79c86fd 100644 --- a/trunk/kernel/jump_label.c +++ b/trunk/kernel/jump_label.c @@ -142,7 +142,7 @@ static int __jump_label_text_reserved(struct jump_entry *iter_start, * running code can override this to make the non-live update case * cheaper. */ -void __weak arch_jump_label_transform_static(struct jump_entry *entry, +void __weak __init_or_module arch_jump_label_transform_static(struct jump_entry *entry, enum jump_label_type type) { arch_jump_label_transform(entry, type);