From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Fwd: [PATCH v2] jump_label: fix jump_label update Date: Thu, 23 Jun 2011 15:46:09 +0300 Message-ID: <4E033591.5060104@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit To: KVM list Return-path: Received: from mx1.redhat.com ([209.132.183.28]:16593 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759221Ab1FWMqM (ORCPT ); Thu, 23 Jun 2011 08:46:12 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p5NCkBjM030453 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 23 Jun 2011 08:46:11 -0400 Sender: kvm-owner@vger.kernel.org List-ID: If you're having ftrace issues with kvm.git, this patch should fix them up. -------- Original Message -------- Subject: [PATCH v2] jump_label: fix jump_label update Date: Tue, 21 Jun 2011 10:35:55 +0800 From: Xiao Guangrong To: Ingo Molnar CC: Steven Rostedt , Jason Baron , Jiri Olsa , LKML The key of module is out of __stop___jump_table, it causes the events of modules does not work Signed-off-by: Xiao Guangrong --- kernel/jump_label.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/kernel/jump_label.c b/kernel/jump_label.c index fa27e75..a8ce450 100644 --- a/kernel/jump_label.c +++ b/kernel/jump_label.c @@ -375,15 +375,19 @@ int jump_label_text_reserved(void *start, void *end) static void jump_label_update(struct jump_label_key *key, int enable) { - struct jump_entry *entry = key->entries; - - /* if there are no users, entry can be NULL */ - if (entry) - __jump_label_update(key, entry, __stop___jump_table, enable); + struct jump_entry *entry = key->entries, *stop = __stop___jump_table; #ifdef CONFIG_MODULES + struct module *mod = __module_address((jump_label_t)key); + __jump_label_mod_update(key, enable); + + if (mod) + stop = mod->jump_entries + mod->num_jump_entries; #endif + /* if there are no users, entry can be NULL */ + if (entry) + __jump_label_update(key, entry, stop, enable); } #endif -- 1.7.5.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/