Commit 8a8365c5 authored by Frederik Deweerdt's avatar Frederik Deweerdt Committed by Marcelo Tosatti

KVM: MMU: fix pointer cast

On a 32 bits compile, commit 3da0dd43
introduced the following warnings:

arch/x86/kvm/mmu.c: In function ‘kvm_set_pte_rmapp’:
arch/x86/kvm/mmu.c:770: warning: cast to pointer from integer of different size
arch/x86/kvm/mmu.c: In function ‘kvm_set_spte_hva’:
arch/x86/kvm/mmu.c:849: warning: cast from pointer to integer of different size

The following patch uses 'unsigned long' instead of u64 to match the
pointer size on both arches.
Signed-off-by: default avatarFrederik Deweerdt <frederik.deweerdt@xprog.eu>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent ace15464
...@@ -748,7 +748,8 @@ static int rmap_write_protect(struct kvm *kvm, u64 gfn) ...@@ -748,7 +748,8 @@ static int rmap_write_protect(struct kvm *kvm, u64 gfn)
return write_protected; return write_protected;
} }
static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp, u64 data) static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp,
unsigned long data)
{ {
u64 *spte; u64 *spte;
int need_tlb_flush = 0; int need_tlb_flush = 0;
...@@ -763,7 +764,8 @@ static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp, u64 data) ...@@ -763,7 +764,8 @@ static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp, u64 data)
return need_tlb_flush; return need_tlb_flush;
} }
static int kvm_set_pte_rmapp(struct kvm *kvm, unsigned long *rmapp, u64 data) static int kvm_set_pte_rmapp(struct kvm *kvm, unsigned long *rmapp,
unsigned long data)
{ {
int need_flush = 0; int need_flush = 0;
u64 *spte, new_spte; u64 *spte, new_spte;
...@@ -799,9 +801,10 @@ static int kvm_set_pte_rmapp(struct kvm *kvm, unsigned long *rmapp, u64 data) ...@@ -799,9 +801,10 @@ static int kvm_set_pte_rmapp(struct kvm *kvm, unsigned long *rmapp, u64 data)
return 0; return 0;
} }
static int kvm_handle_hva(struct kvm *kvm, unsigned long hva, u64 data, static int kvm_handle_hva(struct kvm *kvm, unsigned long hva,
unsigned long data,
int (*handler)(struct kvm *kvm, unsigned long *rmapp, int (*handler)(struct kvm *kvm, unsigned long *rmapp,
u64 data)) unsigned long data))
{ {
int i, j; int i, j;
int retval = 0; int retval = 0;
...@@ -846,10 +849,11 @@ int kvm_unmap_hva(struct kvm *kvm, unsigned long hva) ...@@ -846,10 +849,11 @@ int kvm_unmap_hva(struct kvm *kvm, unsigned long hva)
void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte) void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte)
{ {
kvm_handle_hva(kvm, hva, (u64)&pte, kvm_set_pte_rmapp); kvm_handle_hva(kvm, hva, (unsigned long)&pte, kvm_set_pte_rmapp);
} }
static int kvm_age_rmapp(struct kvm *kvm, unsigned long *rmapp, u64 data) static int kvm_age_rmapp(struct kvm *kvm, unsigned long *rmapp,
unsigned long data)
{ {
u64 *spte; u64 *spte;
int young = 0; int young = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment