From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH] kmod: Adjust kvm_smp_send_reschedule availability Date: Mon, 11 May 2009 17:37:08 +0200 Message-ID: <4A084624.4010704@siemens.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: kvm-devel To: Avi Kivity Return-path: Received: from gecko.sbs.de ([194.138.37.40]:17166 "EHLO gecko.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756179AbZEKPh0 (ORCPT ); Mon, 11 May 2009 11:37:26 -0400 Sender: kvm-owner@vger.kernel.org List-ID: Also x86_64 before 2.6.26 requires kvm_smp_send_reschedule. Signed-off-by: Jan Kiszka --- external-module-compat-comm.h | 6 ++++-- external-module-compat.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/external-module-compat-comm.h b/external-module-compat-comm.h index 88d2314..e1e203c 100644 --- a/external-module-compat-comm.h +++ b/external-module-compat-comm.h @@ -214,10 +214,12 @@ typedef _Bool bool; #endif /* - * smp_call_function_mask() is not defined/exported below 2.6.24 + * smp_call_function_mask() is not defined/exported below 2.6.24 on all + * targets and below 2.6.26 on x86-64 */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) || \ + (defined CONFIG_X86_64 && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)) int kvm_smp_call_function_mask(cpumask_t mask, void (*func) (void *info), void *info, int wait); diff --git a/external-module-compat.c b/external-module-compat.c index ca269cc..f6013f3 100644 --- a/external-module-compat.c +++ b/external-module-compat.c @@ -138,10 +138,12 @@ uint64_t div64_u64(uint64_t dividend, uint64_t divisor) #endif /* - * smp_call_function_mask() is not defined/exported below 2.6.24 + * smp_call_function_mask() is not defined/exported below 2.6.24 on all + * targets and below 2.6.26 on x86-64 */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) || \ + (defined CONFIG_X86_64 && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)) #include