Merge tag 'kvm-3.10-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[platform/upstream/kernel-adaptation-pc.git] / arch / powerpc / kvm / book3s_hv.c

diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 178521e..9de24f8 100644 (file)
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -1540,7 +1540,7 @@ static int kvm_rma_release(struct inode *inode, struct file *filp)
        return 0;
 }
 
-static struct file_operations kvm_rma_fops = {
+static const struct file_operations kvm_rma_fops = {
        .mmap           = kvm_rma_mmap,
        .release        = kvm_rma_release,
 };
@@ -1572,7 +1572,13 @@ static void kvmppc_add_seg_page_size(struct kvm_ppc_one_seg_page_size **sps,
        (*sps)->page_shift = def->shift;
        (*sps)->slb_enc = def->sllp;
        (*sps)->enc[0].page_shift = def->shift;
-       (*sps)->enc[0].pte_enc = def->penc;
+       /*
+        * Only return base page encoding. We don't want to return
+        * all the supporting pte_enc, because our H_ENTER doesn't
+        * support MPSS yet. Once they do, we can start passing all
+        * support pte_enc here
+        */
+       (*sps)->enc[0].pte_enc = def->penc[linux_psize];
        (*sps)++;
 }