From 4effcb2db26ff15930a8938ebc5c52331380c187 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Tue, 19 Jul 2011 11:44:21 -0700 Subject: [PATCH] --- yaml --- r: 267627 b: refs/heads/master c: dec317fd6accfdba4daff13aa4d9f5abde02b347 h: refs/heads/master i: 267625: 6322fccc6ac6485b4797b2a7eca51e9d5f6b0b59 267623: 04d8fad569558ce189b2850ca8cf36d1c6f6faf6 v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/hv.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 75ad440cd6b8..fae7642bb61a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 064931d0bb088c56e80d427e91a812ee7dd8c7dc +refs/heads/master: dec317fd6accfdba4daff13aa4d9f5abde02b347 diff --git a/trunk/drivers/staging/hv/hv.c b/trunk/drivers/staging/hv/hv.c index 824f81679ae8..2192d7885d48 100644 --- a/trunk/drivers/staging/hv/hv.c +++ b/trunk/drivers/staging/hv/hv.c @@ -111,7 +111,7 @@ static u64 do_hypercall(u64 control, void *input, void *output) u64 hv_status = 0; u64 input_address = (input) ? virt_to_phys(input) : 0; u64 output_address = (output) ? virt_to_phys(output) : 0; - volatile void *hypercall_page = hv_context.hypercall_page; + void *hypercall_page = hv_context.hypercall_page; __asm__ __volatile__("mov %0, %%r8" : : "r" (output_address) : "r8"); __asm__ __volatile__("call *%3" : "=a" (hv_status) : @@ -132,7 +132,7 @@ static u64 do_hypercall(u64 control, void *input, void *output) u64 output_address = (output) ? virt_to_phys(output) : 0; u32 output_address_hi = output_address >> 32; u32 output_address_lo = output_address & 0xFFFFFFFF; - volatile void *hypercall_page = hv_context.hypercall_page; + void *hypercall_page = hv_context.hypercall_page; __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi), "=a"(hv_status_lo) : "d" (control_hi),