From: Al Viro <[email protected]>
Signed-off-by: Al Viro <[email protected]>
---
arch/powerpc/kvm/book3s_pr.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index 3775664..9bdf9e3 100644
--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
@@ -1375,7 +1375,7 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_pr(struct
kvm *kvm,
struct kvmppc_vcpu_book3s *vcpu_book3s;
struct kvm_vcpu *vcpu;
int err = -ENOMEM;
- unsigned long p;
+ void *p;
vcpu = kmem_cache_zalloc(kvm_vcpu_cache, GFP_KERNEL);
if (!vcpu)
@@ -1398,10 +1398,10 @@ static struct kvm_vcpu
*kvmppc_core_vcpu_create_pr(struct kvm *kvm,
goto free_shadow_vcpu;
err = -ENOMEM;
- p = __get_free_page(GFP_KERNEL|__GFP_ZERO);
+ p = get_free_page(GFP_KERNEL|__GFP_ZERO);
if (!p)
goto uninit_vcpu;
- vcpu->arch.shared = (void *)p;
+ vcpu->arch.shared = p;
#ifdef CONFIG_PPC_BOOK3S_64
/* Always start the shared struct in native endian mode */
#ifdef __BIG_ENDIAN__
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
