* [PATCH] RISC-V: KVM: Fix compile after merge
@ 2022-08-05 13:02 ` Andrew Jones
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Jones @ 2022-08-05 13:02 UTC (permalink / raw)
To: kvm-riscv
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;
--
2.37.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] RISC-V: KVM: Fix compile after merge
@ 2022-08-05 13:02 ` Andrew Jones
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Jones @ 2022-08-05 13:02 UTC (permalink / raw)
To: kvm, kvm-riscv; +Cc: Paolo Bonzini, Anup Patel
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;
--
2.37.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] RISC-V: KVM: Fix compile after merge
2022-08-05 13:02 ` Andrew Jones
@ 2022-08-05 13:28 ` Paolo Bonzini
-1 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2022-08-05 13:28 UTC (permalink / raw)
To: kvm-riscv
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] RISC-V: KVM: Fix compile after merge
@ 2022-08-05 13:28 ` Paolo Bonzini
0 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2022-08-05 13:28 UTC (permalink / raw)
To: Andrew Jones, kvm, kvm-riscv; +Cc: Anup Patel
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-08-05 13:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2022-08-05 13:28 ` Paolo Bonzini
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.