From patchwork Fri Mar 15 00:13:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 2274481 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 9B322DFB79 for ; Fri, 15 Mar 2013 00:14:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751409Ab3COANv (ORCPT ); Thu, 14 Mar 2013 20:13:51 -0400 Received: from mail-pb0-f53.google.com ([209.85.160.53]:61735 "EHLO mail-pb0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750820Ab3COANu (ORCPT ); Thu, 14 Mar 2013 20:13:50 -0400 Received: by mail-pb0-f53.google.com with SMTP id un1so2963208pbc.26 for ; Thu, 14 Mar 2013 17:13:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=USq/US8Hpby0Ny/rsE7vl5aJ9ErD10J6ZMeRLBJdhCw=; b=SAAZyRQcW3AjUnsSNW7vY6DXzRFLI0jRxNWqQOjfmJqbZ3J2wnervC01oUc/QL1bJu ecq8/hqMV3asDh3AXiWnE+P6TEOs+n/7K4CUwAG7dxKBIxj0+lUJ9MNmLgcWvgVVz3RF sHQMSuQ7KTvSpRzCOE/HUkErVUDGGvegXCCdzLzsguKBIkmvAqh9Etbmb4SBBSu6t+dX bOXtat7Z37qPL3wIf73hRVuAnmW2o/pJ5Wk31pmShzPABclPtEND6jYD+3qbC34BdysV 96IcoKgzxG4lYw4khEQgqOZBnjeKPs9tHK/k7ikSfwo2dOfmWYjQTusIq4iNF7OJzD+D C5bQ== X-Received: by 10.68.58.3 with SMTP id m3mr11014062pbq.69.1363306429935; Thu, 14 Mar 2013 17:13:49 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPS id xz5sm5578425pbb.25.2013.03.14.17.13.48 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 14 Mar 2013 17:13:48 -0700 (PDT) From: Kevin Hilman To: Frederic Weisbecker Cc: linaro-kernel@lists.linaro.org, Marcelo Tosatti , Gleb Natapov , kvm@vger.kernel.org (open list:KERNEL VIRTUAL MA...), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] KVM: allow host header to be included even for !CONFIG_KVM Date: Thu, 14 Mar 2013 17:13:46 -0700 Message-Id: <1363306426-27209-1-git-send-email-khilman@linaro.org> X-Mailer: git-send-email 1.8.1.2 X-Gm-Message-State: ALoCoQnFqe/zBctchrXb99LpUTWomSN6vppKc+dZOrneZTBqIBcaNejq5Ouzqt/nUJbNCvDh9zR1 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org The new context tracking subsystem unconditionally includes kvm_host.h headers for the guest enter/exit macros. This causes a compile failure when KVM is not enabled. Fix by adding an IS_ENABLED(CONFIG_KVM) check to kvm_host so it can be included/compiled even when KVM is not enabled. Cc: Frederic Weisbecker Signed-off-by: Kevin Hilman --- Applies on v3.9-rc2 include/linux/kvm_host.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index cad77fe..a942863 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1,6 +1,8 @@ #ifndef __KVM_HOST_H #define __KVM_HOST_H +#if IS_ENABLED(CONFIG_KVM) + /* * This work is licensed under the terms of the GNU GPL, version 2. See * the COPYING file in the top-level directory. @@ -1055,5 +1057,8 @@ static inline bool kvm_vcpu_eligible_for_directed_yield(struct kvm_vcpu *vcpu) } #endif /* CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT */ +#else +static inline void __guest_enter(void) { return; } +static inline void __guest_exit(void) { return; } +#endif /* IS_ENABLED(CONFIG_KVM) */ #endif -