From: Paolo Bonzini <pbonzini@redhat.com>
To: kvm-riscv@lists.infradead.org
Subject: [PATCH] RISC-V: KVM: Fix compile after merge
Date: Fri, 5 Aug 2022 15:28:11 +0200 [thread overview]
Message-ID: <fbc62d04-bcff-d8e9-02b1-cf3510f80866@redhat.com> (raw)
In-Reply-To: <20220805130256.683070-1-ajones@ventanamicro.com>
On 8/5/22 15:02, Andrew Jones wrote:
> The compiler usually complains that we've forgotten to dot our i's and
> cross our t's, but this time it was complaining that we dotted our
> commas. Undot the commas (a.k.a change ; to ,) to restore compilation.
>
> Applies to kvm/queue.
>
> Fixes: 24688433d2ef ("Merge remote-tracking branch 'kvm/next' into kvm-next-5.20")
> Signed-off-by: Andrew Jones <ajones@ventanamicro.com>
> ---
> arch/riscv/kvm/mmu.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/riscv/kvm/mmu.c b/arch/riscv/kvm/mmu.c
> index f9edfe31656c..3a35b2d95697 100644
> --- a/arch/riscv/kvm/mmu.c
> +++ b/arch/riscv/kvm/mmu.c
> @@ -352,8 +352,8 @@ int kvm_riscv_gstage_ioremap(struct kvm *kvm, gpa_t gpa,
> unsigned long pfn;
> phys_addr_t addr, end;
> struct kvm_mmu_memory_cache pcache = {
> - .gfp_custom = (in_atomic) ? GFP_ATOMIC | __GFP_ACCOUNT : 0;
> - .gfp_zero = __GFP_ZERO;
> + .gfp_custom = (in_atomic) ? GFP_ATOMIC | __GFP_ACCOUNT : 0,
> + .gfp_zero = __GFP_ZERO,
> };
>
> end = (gpa + size + PAGE_SIZE - 1) & PAGE_MASK;
Hi, this is already fixed in Linus's tree. I will rebase kvm/queue soon.
Paolo
WARNING: multiple messages have this Message-ID (diff)
From: Paolo Bonzini <pbonzini@redhat.com>
To: Andrew Jones <ajones@ventanamicro.com>,
kvm@vger.kernel.org, kvm-riscv@lists.infradead.org
Cc: Anup Patel <anup@brainfault.org>
Subject: Re: [PATCH] RISC-V: KVM: Fix compile after merge
Date: Fri, 5 Aug 2022 15:28:11 +0200 [thread overview]
Message-ID: <fbc62d04-bcff-d8e9-02b1-cf3510f80866@redhat.com> (raw)
In-Reply-To: <20220805130256.683070-1-ajones@ventanamicro.com>
On 8/5/22 15:02, Andrew Jones wrote:
> The compiler usually complains that we've forgotten to dot our i's and
> cross our t's, but this time it was complaining that we dotted our
> commas. Undot the commas (a.k.a change ; to ,) to restore compilation.
>
> Applies to kvm/queue.
>
> Fixes: 24688433d2ef ("Merge remote-tracking branch 'kvm/next' into kvm-next-5.20")
> Signed-off-by: Andrew Jones <ajones@ventanamicro.com>
> ---
> arch/riscv/kvm/mmu.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/riscv/kvm/mmu.c b/arch/riscv/kvm/mmu.c
> index f9edfe31656c..3a35b2d95697 100644
> --- a/arch/riscv/kvm/mmu.c
> +++ b/arch/riscv/kvm/mmu.c
> @@ -352,8 +352,8 @@ int kvm_riscv_gstage_ioremap(struct kvm *kvm, gpa_t gpa,
> unsigned long pfn;
> phys_addr_t addr, end;
> struct kvm_mmu_memory_cache pcache = {
> - .gfp_custom = (in_atomic) ? GFP_ATOMIC | __GFP_ACCOUNT : 0;
> - .gfp_zero = __GFP_ZERO;
> + .gfp_custom = (in_atomic) ? GFP_ATOMIC | __GFP_ACCOUNT : 0,
> + .gfp_zero = __GFP_ZERO,
> };
>
> end = (gpa + size + PAGE_SIZE - 1) & PAGE_MASK;
Hi, this is already fixed in Linus's tree. I will rebase kvm/queue soon.
Paolo
next prev parent reply other threads:[~2022-08-05 13:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-05 13:02 [PATCH] RISC-V: KVM: Fix compile after merge Andrew Jones
2022-08-05 13:02 ` Andrew Jones
2022-08-05 13:28 ` Paolo Bonzini [this message]
2022-08-05 13:28 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fbc62d04-bcff-d8e9-02b1-cf3510f80866@redhat.com \
--to=pbonzini@redhat.com \
--cc=kvm-riscv@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.