Commit 9f9eae5c authored by Mathieu Malaterre's avatar Mathieu Malaterre Committed by Michael Ellerman

powerpc/kvm: Prefer fault_in_pages_readable function

Directly use fault_in_pages_readable instead of manual __get_user code. Fix
warning treated as error with W=1:

  arch/powerpc/kernel/kvm.c:675:6: error: variable ‘tmp’ set but not used [-Werror=unused-but-set-variable]
Suggested-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMathieu Malaterre <malat@debian.org>
Reviewed-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 0078778a
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <linux/kvm_para.h> #include <linux/kvm_para.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/pagemap.h>
#include <asm/reg.h> #include <asm/reg.h>
#include <asm/sections.h> #include <asm/sections.h>
...@@ -672,14 +673,13 @@ static void kvm_use_magic_page(void) ...@@ -672,14 +673,13 @@ static void kvm_use_magic_page(void)
{ {
u32 *p; u32 *p;
u32 *start, *end; u32 *start, *end;
u32 tmp;
u32 features; u32 features;
/* Tell the host to map the magic page to -4096 on all CPUs */ /* Tell the host to map the magic page to -4096 on all CPUs */
on_each_cpu(kvm_map_magic_page, &features, 1); on_each_cpu(kvm_map_magic_page, &features, 1);
/* Quick self-test to see if the mapping works */ /* Quick self-test to see if the mapping works */
if (__get_user(tmp, (u32*)KVM_MAGIC_PAGE)) { if (!fault_in_pages_readable((const char *)KVM_MAGIC_PAGE, sizeof(u32))) {
kvm_patching_worked = false; kvm_patching_worked = false;
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment