[PATCH] RISC-V: KVM: Fix compile after merge

Paolo Bonzini pbonzini at redhat.com
Fri Aug 5 06:28:11 PDT 2022


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 at 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




More information about the kvm-riscv mailing list