From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759896Ab3BZTaA (ORCPT ); Tue, 26 Feb 2013 14:30:00 -0500 Received: from mail-pb0-f41.google.com ([209.85.160.41]:64902 "EHLO mail-pb0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757815Ab3BZT37 (ORCPT ); Tue, 26 Feb 2013 14:29:59 -0500 From: Kevin Hilman To: Frederic Weisbecker Cc: Mats Liljegren , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linaro-dev@lists.linaro.org Subject: Re: [RFC/PATCH 1/5] context tracking: conditionalize guest support based on CONFIG_KVM References: <1361389302-11968-1-git-send-email-khilman@linaro.org> <1361389302-11968-2-git-send-email-khilman@linaro.org> <20130222132750.GE17948@somewhere.redhat.com> Date: Tue, 26 Feb 2013 11:29:55 -0800 In-Reply-To: <20130222132750.GE17948@somewhere.redhat.com> (Frederic Weisbecker's message of "Fri, 22 Feb 2013 14:27:52 +0100") Message-ID: <87fw0izxe4.fsf@linaro.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Frederic Weisbecker writes: > On Wed, Feb 20, 2013 at 11:41:38AM -0800, Kevin Hilman wrote: >> So that it can build on !KVM systems too. >> >> Signed-off-by: Kevin Hilman >> --- >> kernel/context_tracking.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c >> index 74f68f4..6fe96b1 100644 >> --- a/kernel/context_tracking.c >> +++ b/kernel/context_tracking.c >> @@ -1,5 +1,7 @@ >> #include >> +#ifdef CONFIG_KVM >> #include >> +#endif > > The header should take care of the off-case, no need to ifdef its inclusion. In their current form, the headers will not build on platforms without KVM support. For example, these platforms (like ARM) don't even have or . >> #include >> #include >> #include >> @@ -62,6 +64,7 @@ void user_exit(void) >> local_irq_restore(flags); >> } >> >> +#ifdef CONFIG_KVM >> void guest_enter(void) >> { >> if (vtime_accounting_enabled()) >> @@ -79,6 +82,7 @@ void guest_exit(void) >> __guest_exit(); >> } >> EXPORT_SYMBOL_GPL(guest_exit); >> +#endif > > Kvm might be built as a module so we can't actually do this unfortunately. Ah, right. How bout using #if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE) for both conditionals above? Updated patch below. Kevin >>From 4444ce39eea21a5fc63b04a711addab2a5c63243 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 14 Feb 2013 10:17:37 -0800 Subject: [PATCH] context tracking: conditionalize guest support based on CONFIG_KVM So that it can build on !KVM systems too. Signed-off-by: Kevin Hilman --- kernel/context_tracking.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c index 74f68f4..d9c98dd 100644 --- a/kernel/context_tracking.c +++ b/kernel/context_tracking.c @@ -1,5 +1,7 @@ #include +#if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE) #include +#endif #include #include #include @@ -62,6 +64,7 @@ void user_exit(void) local_irq_restore(flags); } +#if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE) void guest_enter(void) { if (vtime_accounting_enabled()) @@ -79,6 +82,7 @@ void guest_exit(void) __guest_exit(); } EXPORT_SYMBOL_GPL(guest_exit); +#endif void context_tracking_task_switch(struct task_struct *prev, struct task_struct *next) -- 1.8.1.2