Commit 48908a38 authored by Ram Pai's avatar Ram Pai Committed by Paul Mackerras
Browse files

KVM: PPC: Book3S HV: Fix function definition in book3s_hv_uvmem.c 



Without this fix, git is confused. It generates wrong
function context for code changes in subsequent patches.
Weird, but true.

Signed-off-by: default avatarRam Pai <linuxram@us.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent 7ec21d9d

arch/powerpc/kvm/book3s_hv_uvmem.c

+10 −11
Original line number Diff line number Diff line
@@ -382,8 +382,7 @@ static struct page *kvmppc_uvmem_get_page(unsigned long gpa, struct kvm *kvm) 
 * Alloc a PFN from private device memory pool and copy page from normal

 * memory to secure memory using UV_PAGE_IN uvcall.

 */

static int

kvmppc_svm_page_in(struct vm_area_struct *vma, unsigned long start,

static int kvmppc_svm_page_in(struct vm_area_struct *vma, unsigned long start,

		   unsigned long end, unsigned long gpa, struct kvm *kvm,

		   unsigned long page_shift, bool *downgrade)

{
@@ -450,8 +449,8 @@ kvmppc_svm_page_in(struct vm_area_struct *vma, unsigned long start, 
 * In the former case, uses dev_pagemap_ops.migrate_to_ram handler

 * to unmap the device page from QEMU's page tables.

 */

static unsigned long

kvmppc_share_page(struct kvm *kvm, unsigned long gpa, unsigned long page_shift)

static unsigned long kvmppc_share_page(struct kvm *kvm, unsigned long gpa,

		unsigned long page_shift)

{



	int ret = H_PARAMETER;
@@ -500,9 +499,9 @@ kvmppc_share_page(struct kvm *kvm, unsigned long gpa, unsigned long page_shift) 
 * H_PAGE_IN_SHARED flag makes the page shared which means that the same

 * memory in is visible from both UV and HV.

 */

unsigned long

kvmppc_h_svm_page_in(struct kvm *kvm, unsigned long gpa,

		     unsigned long flags, unsigned long page_shift)

unsigned long kvmppc_h_svm_page_in(struct kvm *kvm, unsigned long gpa,

		unsigned long flags,

		unsigned long page_shift)

{

	bool downgrade = false;

	unsigned long start, end;
@@ -559,8 +558,8 @@ kvmppc_h_svm_page_in(struct kvm *kvm, unsigned long gpa, 
 * Provision a new page on HV side and copy over the contents

 * from secure memory using UV_PAGE_OUT uvcall.

 */

static int

kvmppc_svm_page_out(struct vm_area_struct *vma, unsigned long start,

static int kvmppc_svm_page_out(struct vm_area_struct *vma,

		unsigned long start,

		unsigned long end, unsigned long page_shift,

		struct kvm *kvm, unsigned long gpa)

{