lkml.org 
[lkml]   [2011]   [Dec]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: Current kernel fails to compile with KVM on PowerPC
On 12/24/2011 07:05 PM, Alexander Graf wrote:
> I was actually thinking of:
>
> commit dfc209648daf8ba4197e71376b76c95fd26fd272
> Author: Andreas Schwab <schwab@linux-m68k.org>
> Date: Tue Nov 8 07:17:39 2011 +0000
>
> KVM: PPC: protect use of kvmppc_h_pr
>
> kvmppc_h_pr is only available if CONFIG_KVM_BOOK3S_64_PR.
>
> Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
> Signed-off-by: Alexander Graf <agraf@suse.de>
>
> diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
> index 72559b0..aaefe19 100644
> --- a/arch/powerpc/kvm/book3s_pr.c
> +++ b/arch/powerpc/kvm/book3s_pr.c
> @@ -660,10 +660,12 @@ program_interrupt:
> ulong cmd = kvmppc_get_gpr(vcpu, 3);
> int i;
>
> +#ifdef CONFIG_KVM_BOOK3S_64_PR
> if (kvmppc_h_pr(vcpu, cmd) == EMULATE_DONE) {
> r = RESUME_GUEST;
> break;
> }
> +#endif
>
> run->papr_hcall.nr = cmd;
> for (i = 0; i < 9; ++i) {
>
> But yes :). I guess we need to make sure this commit also lands in 3.2 :(.
>
>

Please post it ASAP, I'm preparing a pull request for 3.2.

--
error compiling committee.c: too many arguments to function



\
 
 \ /
  Last update: 2011-12-25 10:41    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site