From patchwork Fri Oct 22 08:50:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 273481 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9M8kgc5010878 for ; Fri, 22 Oct 2010 08:46:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751481Ab0JVIqF (ORCPT ); Fri, 22 Oct 2010 04:46:05 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:59046 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751406Ab0JVIqE convert rfc822-to-8bit (ORCPT ); Fri, 22 Oct 2010 04:46:04 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 3CF44170765; Fri, 22 Oct 2010 16:46:01 +0800 (CST) Received: from 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 o9M8fura021434; Fri, 22 Oct 2010 16:41:56 +0800 Received: from [10.167.225.99] (unknown [10.167.225.99]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id 81FD614C06D; Fri, 22 Oct 2010 16:47:37 +0800 (CST) Message-ID: <4CC15051.3030207@cn.fujitsu.com> Date: Fri, 22 Oct 2010 16:50:25 +0800 From: Xiao Guangrong User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.11) Gecko/20100713 Thunderbird/3.0.6 MIME-Version: 1.0 To: Avi Kivity CC: Marcelo Tosatti , LKML , KVM Subject: [PATCH] KVM: mark the function 'inline' defined in .h file Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 22 Oct 2010 08:46:42 +0000 (UTC) diff --git a/arch/x86/include/asm/kvm_para.h b/arch/x86/include/asm/kvm_para.h index d3a1a48..a427bf7 100644 --- a/arch/x86/include/asm/kvm_para.h +++ b/arch/x86/include/asm/kvm_para.h @@ -182,7 +182,7 @@ u32 kvm_read_and_reset_pf_reason(void); #define kvm_guest_init() do { } while (0) #define kvm_async_pf_task_wait(T) do {} while(0) #define kvm_async_pf_task_wake(T) do {} while(0) -static u32 kvm_read_and_reset_pf_reason(void) +static inline u32 kvm_read_and_reset_pf_reason(void) { return 0; }