Merge commit 'v2.6.37-rc1' into for-2.6.37

[net-next-2.6.git] / kernel / jump_label.c

diff --git a/kernel/jump_label.c b/kernel/jump_label.c
index 12cce78e956874d0a38636b79ff7b76746ae83ec..3b79bd9383307a2b5a8325f53ed4ca472c77d9f8 100644 (file)
--- a/kernel/jump_label.c
+++ b/kernel/jump_label.c
@@ -270,6 +270,13 @@ out:
        return conflict;
 }
 
+/*
+ * Not all archs need this.
+ */
+void __weak arch_jump_label_text_poke_early(jump_label_t addr)
+{
+}
+
 static __init int init_jump_label(void)
 {
        int ret;