From patchwork Fri Dec 7 05:40:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yanfei Zhang X-Patchwork-Id: 1848511 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id CFB8D3FCD5 for ; Fri, 7 Dec 2012 05:43:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424400Ab2LGFm7 (ORCPT ); Fri, 7 Dec 2012 00:42:59 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:27898 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1424218Ab2LGFm6 (ORCPT ); Fri, 7 Dec 2012 00:42:58 -0500 X-IronPort-AV: E=Sophos;i="4.84,235,1355068800"; d="scan'208";a="6350840" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 07 Dec 2012 13:41:07 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id qB75hUaf032502; Fri, 7 Dec 2012 13:43:30 +0800 Received: from [10.167.226.121] ([10.167.226.121]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2012120713421433-290490 ; Fri, 7 Dec 2012 13:42:14 +0800 Message-ID: <50C18168.305@cn.fujitsu.com> Date: Fri, 07 Dec 2012 13:40:56 +0800 From: Zhang Yanfei User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.8) Gecko/20121012 Thunderbird/10.0.8 MIME-Version: 1.0 To: "Eric W. Biederman" , Gleb Natapov CC: "kvm@vger.kernel.org" , "kexec@lists.infradead.org" , "linux-kernel@vger.kernel.org" , kbuild test robot Subject: [PATCH] x86/kexec: crash_vmclear_local_vmcss needs __rcu X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/12/07 13:42:14, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/12/07 13:42:14, Serialize complete at 2012/12/07 13:42:14 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This removes the sparse warning: arch/x86/kernel/crash.c:49:32: sparse: incompatible types in comparison expression (different address spaces) Reported-by: kbuild test robot Signed-off-by: Zhang Yanfei --- arch/x86/include/asm/kexec.h | 4 +++- arch/x86/kernel/crash.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/kexec.h b/arch/x86/include/asm/kexec.h index 28feeba..16882cd 100644 --- a/arch/x86/include/asm/kexec.h +++ b/arch/x86/include/asm/kexec.h @@ -163,7 +163,9 @@ struct kimage_arch { }; #endif -extern void (*crash_vmclear_loaded_vmcss)(void); +extern void __rcu (*crash_vmclear_loaded_vmcss)(void); +#define vmclear_func_rcu(vmclear_func) \ + ((void (*)(void)) rcu_dereference(vmclear_func)) #endif /* __ASSEMBLY__ */ diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 2f6b8e8..50ce1d6 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -38,7 +38,7 @@ int in_crash_kexec; * * protected by rcu. */ -void (*crash_vmclear_loaded_vmcss)(void) = NULL; +void __rcu (*crash_vmclear_loaded_vmcss)(void) = NULL; EXPORT_SYMBOL_GPL(crash_vmclear_loaded_vmcss); static inline void cpu_crash_vmclear_loaded_vmcss(void) @@ -46,7 +46,7 @@ static inline void cpu_crash_vmclear_loaded_vmcss(void) void (*do_vmclear_operation)(void) = NULL; rcu_read_lock(); - do_vmclear_operation = rcu_dereference(crash_vmclear_loaded_vmcss); + do_vmclear_operation = vmclear_func_rcu(crash_vmclear_loaded_vmcss); if (do_vmclear_operation) do_vmclear_operation(); rcu_read_unlock();