|
@@ -28,6 +28,7 @@
|
|
|
#include <asm/kvm_ppc.h>
|
|
|
#include <asm/kvm_book3s.h>
|
|
|
#include <asm/mmu_context.h>
|
|
|
+#include <asm/page.h>
|
|
|
#include <linux/gfp.h>
|
|
|
#include <linux/sched.h>
|
|
|
#include <linux/vmalloc.h>
|
|
@@ -1342,8 +1343,8 @@ struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id)
|
|
|
vcpu_book3s->slb_nr = 64;
|
|
|
|
|
|
/* remember where some real-mode handlers are */
|
|
|
- vcpu->arch.trampoline_lowmem = (ulong)kvmppc_handler_lowmem_trampoline;
|
|
|
- vcpu->arch.trampoline_enter = (ulong)kvmppc_handler_trampoline_enter;
|
|
|
+ vcpu->arch.trampoline_lowmem = __pa(kvmppc_handler_lowmem_trampoline);
|
|
|
+ vcpu->arch.trampoline_enter = __pa(kvmppc_handler_trampoline_enter);
|
|
|
vcpu->arch.highmem_handler = (ulong)kvmppc_handler_highmem;
|
|
|
#ifdef CONFIG_PPC_BOOK3S_64
|
|
|
vcpu->arch.rmcall = *(ulong*)kvmppc_rmcall;
|