From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752697AbbJFM3w (ORCPT ); Tue, 6 Oct 2015 08:29:52 -0400 Received: from mx2.suse.de ([195.135.220.15]:52564 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750937AbbJFM3r (ORCPT ); Tue, 6 Oct 2015 08:29:47 -0400 From: Jiri Slaby To: Ingo Molnar Cc: linux-kernel@vger.kernel.org, Jiri Slaby , Thomas Gleixner , "H. Peter Anvin" , x86@kernel.org Subject: [PATCH 2/2] x86: text_poke, check if text_mutex is held Date: Tue, 6 Oct 2015 14:29:38 +0200 Message-Id: <1444134578-3790-2-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1444134578-3790-1-git-send-email-jslaby@suse.cz> References: <1444134578-3790-1-git-send-email-jslaby@suse.cz> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is required by the function, su use lockdep (if available) to check the dependency. Signed-off-by: Jiri Slaby Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: x86@kernel.org --- arch/x86/kernel/alternative.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 25f909362b7a..3985c2517a93 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -693,6 +693,8 @@ void *text_poke(void *addr, const void *opcode, size_t len) struct page *pages[2]; int i; + lockdep_assert_held(&text_mutex); + if (!core_kernel_text((unsigned long)addr)) { pages[0] = vmalloc_to_page(addr); pages[1] = vmalloc_to_page(addr + PAGE_SIZE); -- 2.6.1