linux-next: build failure after merge of the vfs tree

From: Stephen Rothwell
Date: Sun Dec 03 2017 - 18:16:57 EST


Hi Al,

After merging the vfs tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

arch/powerpc/kvm/../../../virt/kvm/kvm_main.c: In function 'hva_to_pfn_slow':
arch/powerpc/kvm/../../../virt/kvm/kvm_main.c:1379:35: error: 'start' undeclared (first use in this function)
npages = get_user_pages_unlocked(start, 1, &page, flags);
^

Caused by commit

eeb7c213c804 ("kvm: switch get_user_page_nowait() to get_user_pages_unlocked()")

I have applied the following fix patch for today:

From e9cc05c8ba9b9f19c62b74e81e4beb67ec9fc09e Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 4 Dec 2017 10:13:38 +1100
Subject: [PATCH] kvm: fix for "switch get_user_page_nowait() to get_user_pages_unlocked()"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
virt/kvm/kvm_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 4f0f0045e634..7b4d46432c85 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1376,7 +1376,7 @@ static int hva_to_pfn_slow(unsigned long addr, bool *async, bool write_fault,
if (async)
flags |= FOLL_NOWAIT;

- npages = get_user_pages_unlocked(start, 1, &page, flags);
+ npages = get_user_pages_unlocked(addr, 1, &page, flags);
if (npages != 1)
return npages;

--
2.15.0

--
Cheers,
Stephen Rothwell