Skip to content

Commit 48908a3

Browse files
Ram Paipaulusmack
authored andcommitted
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: Ram Pai <[email protected]> Signed-off-by: Paul Mackerras <[email protected]>
1 parent 7ec21d9 commit 48908a3

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

arch/powerpc/kvm/book3s_hv_uvmem.c

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,7 @@ static struct page *kvmppc_uvmem_get_page(unsigned long gpa, struct kvm *kvm)
382382
* Alloc a PFN from private device memory pool and copy page from normal
383383
* memory to secure memory using UV_PAGE_IN uvcall.
384384
*/
385-
static int
386-
kvmppc_svm_page_in(struct vm_area_struct *vma, unsigned long start,
385+
static int kvmppc_svm_page_in(struct vm_area_struct *vma, unsigned long start,
387386
unsigned long end, unsigned long gpa, struct kvm *kvm,
388387
unsigned long page_shift, bool *downgrade)
389388
{
@@ -450,8 +449,8 @@ kvmppc_svm_page_in(struct vm_area_struct *vma, unsigned long start,
450449
* In the former case, uses dev_pagemap_ops.migrate_to_ram handler
451450
* to unmap the device page from QEMU's page tables.
452451
*/
453-
static unsigned long
454-
kvmppc_share_page(struct kvm *kvm, unsigned long gpa, unsigned long page_shift)
452+
static unsigned long kvmppc_share_page(struct kvm *kvm, unsigned long gpa,
453+
unsigned long page_shift)
455454
{
456455

457456
int ret = H_PARAMETER;
@@ -500,9 +499,9 @@ kvmppc_share_page(struct kvm *kvm, unsigned long gpa, unsigned long page_shift)
500499
* H_PAGE_IN_SHARED flag makes the page shared which means that the same
501500
* memory in is visible from both UV and HV.
502501
*/
503-
unsigned long
504-
kvmppc_h_svm_page_in(struct kvm *kvm, unsigned long gpa,
505-
unsigned long flags, unsigned long page_shift)
502+
unsigned long kvmppc_h_svm_page_in(struct kvm *kvm, unsigned long gpa,
503+
unsigned long flags,
504+
unsigned long page_shift)
506505
{
507506
bool downgrade = false;
508507
unsigned long start, end;
@@ -559,10 +558,10 @@ kvmppc_h_svm_page_in(struct kvm *kvm, unsigned long gpa,
559558
* Provision a new page on HV side and copy over the contents
560559
* from secure memory using UV_PAGE_OUT uvcall.
561560
*/
562-
static int
563-
kvmppc_svm_page_out(struct vm_area_struct *vma, unsigned long start,
564-
unsigned long end, unsigned long page_shift,
565-
struct kvm *kvm, unsigned long gpa)
561+
static int kvmppc_svm_page_out(struct vm_area_struct *vma,
562+
unsigned long start,
563+
unsigned long end, unsigned long page_shift,
564+
struct kvm *kvm, unsigned long gpa)
566565
{
567566
unsigned long src_pfn, dst_pfn = 0;
568567
struct migrate_vma mig;

0 commit comments

Comments
 (0)