pandora: defconfig: update

[pandora-kernel.git] / drivers / hv / hv.c

diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index 17ed6fb..c31014b 100644 (file)
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -27,6 +27,7 @@
 #include <linux/vmalloc.h>
 #include <linux/hyperv.h>
 #include <asm/hyperv.h>
+#include <asm/nospec-branch.h>
 #include "hyperv_vmbus.h"
 
 /* The one and only */
@@ -113,10 +114,13 @@ static u64 do_hypercall(u64 control, void *input, void *output)
        u64 output_address = (output) ? virt_to_phys(output) : 0;
        void *hypercall_page = hv_context.hypercall_page;
 
-       __asm__ __volatile__("mov %0, %%r8" : : "r" (output_address) : "r8");
-       __asm__ __volatile__("call *%3" : "=a" (hv_status) :
-                            "c" (control), "d" (input_address),
-                            "m" (hypercall_page));
+       __asm__ __volatile__("mov %4, %%r8\n"
+                            CALL_NOSPEC
+                            : "=a" (hv_status), ASM_CALL_CONSTRAINT,
+                              "+c" (control), "+d" (input_address)
+                            :  "r" (output_address),
+                               THUNK_TARGET(hypercall_page)
+                            : "cc", "memory", "r8", "r9", "r10", "r11");
 
        return hv_status;
 
@@ -134,11 +138,14 @@ static u64 do_hypercall(u64 control, void *input, void *output)
        u32 output_address_lo = output_address & 0xFFFFFFFF;
        void *hypercall_page = hv_context.hypercall_page;
 
-       __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
-                             "=a"(hv_status_lo) : "d" (control_hi),
-                             "a" (control_lo), "b" (input_address_hi),
-                             "c" (input_address_lo), "D"(output_address_hi),
-                             "S"(output_address_lo), "m" (hypercall_page));
+       __asm__ __volatile__(CALL_NOSPEC
+                            : "=d" (hv_status_hi), "=a" (hv_status_lo),
+                              "+c" (input_address_lo), ASM_CALL_CONSTRAINT
+                            : "d" (control_hi), "a" (control_lo),
+                              "b" (input_address_hi),
+                              "D"(output_address_hi), "S"(output_address_lo),
+                              THUNK_TARGET(hypercall_page)
+                            : "cc", "memory");
 
        return hv_status_lo | ((u64)hv_status_hi << 32);
 #endif /* !x86_64 */
@@ -178,7 +185,7 @@ int hv_init(void)
        /* See if the hypercall page is already set */
        rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
 
-       virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
+       virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
 
        if (!virtaddr)
                goto cleanup;