* [PATCH] kvm-userspace: Fix external modules for pre-2.6.27 UP kernels
@ 2009-01-23 15:03 Jan Kiszka
2009-02-04 18:15 ` Jan Kiszka
0 siblings, 1 reply; 3+ messages in thread
From: Jan Kiszka @ 2009-01-23 15:03 UTC (permalink / raw)
To: Avi Kivity; +Cc: kvm-devel
When disabling SMP on kernels older than 2.6.27, the compat wrapping
fails due to unresolved SMP dependencies. This patch fixes the build.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
kernel/external-module-compat-comm.h | 2 +-
kernel/external-module-compat.c | 15 +++++++++++++++
2 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/kernel/external-module-compat-comm.h b/kernel/external-module-compat-comm.h
index 981dc96..06af36d 100644
--- a/kernel/external-module-compat-comm.h
+++ b/kernel/external-module-compat-comm.h
@@ -54,7 +54,7 @@
int kvm_smp_call_function_single(int cpu, void (*func)(void *info),
void *info, int wait);
-
+#undef smp_call_function_single
#define smp_call_function_single kvm_smp_call_function_single
#endif
diff --git a/kernel/external-module-compat.c b/kernel/external-module-compat.c
index c0a0355..823ce82 100644
--- a/kernel/external-module-compat.c
+++ b/kernel/external-module-compat.c
@@ -86,11 +86,24 @@ int kvm_smp_call_function_single(int cpu, void (*func)(void *info),
#include <linux/smp.h>
+#ifdef CONFIG_SMP
int kvm_smp_call_function_single(int cpu, void (*func)(void *info),
void *info, int wait)
{
return smp_call_function_single(cpu, func, info, 0, wait);
}
+#else /* !CONFIG_SMP */
+int kvm_smp_call_function_single(int cpu, void (*func)(void *info),
+ void *info, int wait)
+{
+ WARN_ON(cpu != 0);
+ local_irq_disable();
+ func(info);
+ local_irq_enable();
+ return 0;
+
+}
+#endif /* !CONFIG_SMP */
#define smp_call_function_single kvm_smp_call_function_single
@@ -162,6 +175,7 @@ static void kvm_ack_smp_call(void *_data)
int kvm_smp_call_function_mask(cpumask_t mask,
void (*func) (void *info), void *info, int wait)
{
+#ifdef CONFIG_SMP
struct kvm_call_data_struct data;
cpumask_t allbutself;
int cpus;
@@ -203,6 +217,7 @@ int kvm_smp_call_function_mask(cpumask_t mask,
}
out:
put_cpu();
+#endif /* CONFIG_SMP */
return 0;
}
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] kvm-userspace: Fix external modules for pre-2.6.27 UP kernels
2009-01-23 15:03 [PATCH] kvm-userspace: Fix external modules for pre-2.6.27 UP kernels Jan Kiszka
@ 2009-02-04 18:15 ` Jan Kiszka
2009-02-05 12:48 ` Avi Kivity
0 siblings, 1 reply; 3+ messages in thread
From: Jan Kiszka @ 2009-02-04 18:15 UTC (permalink / raw)
Cc: Avi Kivity, kvm-devel
Jan Kiszka wrote:
> When disabling SMP on kernels older than 2.6.27, the compat wrapping
> fails due to unresolved SMP dependencies. This patch fixes the build.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>
> kernel/external-module-compat-comm.h | 2 +-
> kernel/external-module-compat.c | 15 +++++++++++++++
> 2 files changed, 16 insertions(+), 1 deletions(-)
>
> diff --git a/kernel/external-module-compat-comm.h b/kernel/external-module-compat-comm.h
> index 981dc96..06af36d 100644
> --- a/kernel/external-module-compat-comm.h
> +++ b/kernel/external-module-compat-comm.h
> @@ -54,7 +54,7 @@
>
> int kvm_smp_call_function_single(int cpu, void (*func)(void *info),
> void *info, int wait);
> -
> +#undef smp_call_function_single
> #define smp_call_function_single kvm_smp_call_function_single
>
> #endif
> diff --git a/kernel/external-module-compat.c b/kernel/external-module-compat.c
> index c0a0355..823ce82 100644
> --- a/kernel/external-module-compat.c
> +++ b/kernel/external-module-compat.c
> @@ -86,11 +86,24 @@ int kvm_smp_call_function_single(int cpu, void (*func)(void *info),
>
> #include <linux/smp.h>
>
> +#ifdef CONFIG_SMP
> int kvm_smp_call_function_single(int cpu, void (*func)(void *info),
> void *info, int wait)
> {
> return smp_call_function_single(cpu, func, info, 0, wait);
> }
> +#else /* !CONFIG_SMP */
> +int kvm_smp_call_function_single(int cpu, void (*func)(void *info),
> + void *info, int wait)
> +{
> + WARN_ON(cpu != 0);
> + local_irq_disable();
> + func(info);
> + local_irq_enable();
> + return 0;
> +
> +}
> +#endif /* !CONFIG_SMP */
>
> #define smp_call_function_single kvm_smp_call_function_single
>
> @@ -162,6 +175,7 @@ static void kvm_ack_smp_call(void *_data)
> int kvm_smp_call_function_mask(cpumask_t mask,
> void (*func) (void *info), void *info, int wait)
> {
> +#ifdef CONFIG_SMP
> struct kvm_call_data_struct data;
> cpumask_t allbutself;
> int cpus;
> @@ -203,6 +217,7 @@ int kvm_smp_call_function_mask(cpumask_t mask,
> }
> out:
> put_cpu();
> +#endif /* CONFIG_SMP */
> return 0;
> }
>
Still applies, still required.
Jan
--
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] kvm-userspace: Fix external modules for pre-2.6.27 UP kernels
2009-02-04 18:15 ` Jan Kiszka
@ 2009-02-05 12:48 ` Avi Kivity
0 siblings, 0 replies; 3+ messages in thread
From: Avi Kivity @ 2009-02-05 12:48 UTC (permalink / raw)
To: Jan Kiszka; +Cc: kvm-devel
Jan Kiszka wrote:
> Jan Kiszka wrote:
>
>> When disabling SMP on kernels older than 2.6.27, the compat wrapping
>> fails due to unresolved SMP dependencies. This patch fixes the build.
>>
>>
> Still applies, still required.
>
Applied, thanks.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-02-05 12:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-23 15:03 [PATCH] kvm-userspace: Fix external modules for pre-2.6.27 UP kernels Jan Kiszka
2009-02-04 18:15 ` Jan Kiszka
2009-02-05 12:48 ` Avi Kivity
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox