summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2011-09-29 11:10:05 -0700
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2011-10-25 11:54:15 -0700
commit37348804e0289087d21ae8bff4c0732030a3c6ac (patch)
treedacd987e7e2778b30fccc4e580f852d9dcbd83b2 /include
parent189c3fd68c7016e37c1ffd7a00009e2c944a9d06 (diff)
jump_label: if a key has already been initialized, don't nop it out
If a key has been enabled before jump_label_init() is called, don't nop it out. This removes arch_jump_label_text_poke_early() (which can only nop out a site) and uses arch_jump_label_transform() instead. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Acked-by: Jason Baron <jbaron@redhat.com> Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Diffstat (limited to 'include')
-rw-r--r--include/linux/jump_label.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h
index 1213e9d63f79..12e804ea32ab 100644
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@ -44,8 +44,7 @@ extern struct jump_entry __stop___jump_table[];
extern void jump_label_lock(void);
extern void jump_label_unlock(void);
extern void arch_jump_label_transform(struct jump_entry *entry,
- enum jump_label_type type);
-extern void arch_jump_label_text_poke_early(jump_label_t addr);
+ enum jump_label_type type);
extern int jump_label_text_reserved(void *start, void *end);
extern void jump_label_inc(struct jump_label_key *key);
extern void jump_label_dec(struct jump_label_key *key);