RISC-V: KVM: Fix compile after merge
Subsystems (3)
PATCH 1/1 RISC-V: KVM: Fix compile after merge
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 <[email protected]>
--- arch/riscv/kvm/mmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/riscv/kvm/mmu.c +2 -2
@@ -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 ;
Signature · 1 line
2.37.1
Paolo Bonzini
maintainerQuoted 17 lines · Andrew Jones
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 <[email protected]>--- arch/riscv/kvm/mmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/riscv/kvm/mmu.c +0
-0
arch/riscv/kvm/mmu.c int kvm_riscv_gstage_ioremap(struct kvm *kvm, gpa_t gpa, · line 359
Quoted 10 lines
arch/riscv/kvm/mmu.c +2
-2@@ -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