diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-10-07 11:24:24 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-07 11:24:24 +0200 |
| commit | 25a9a924c0c8723ced99179eb639e8c5372a2557 (patch) | |
| tree | 83170168d50b9703486327b5b3a0bfb1d8da9b2b /arch/x86/include/asm/xen/hypercall.h | |
| parent | 0b101e62afe626ecae60173f92f1e0ec72151653 (diff) | |
| parent | a0eeb8dd34f21fddfe85b37832b5f3d02ee6e34b (diff) | |
| download | talos-op-linux-25a9a924c0c8723ced99179eb639e8c5372a2557.tar.gz talos-op-linux-25a9a924c0c8723ced99179eb639e8c5372a2557.zip | |
Merge branch 'linus' into x86/asm, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/xen/hypercall.h')
| -rw-r--r-- | arch/x86/include/asm/xen/hypercall.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h index 83aea8055119..4c20dd333412 100644 --- a/arch/x86/include/asm/xen/hypercall.h +++ b/arch/x86/include/asm/xen/hypercall.h @@ -336,10 +336,10 @@ HYPERVISOR_update_descriptor(u64 ma, u64 desc) return _hypercall4(int, update_descriptor, ma, ma>>32, desc, desc>>32); } -static inline int +static inline long HYPERVISOR_memory_op(unsigned int cmd, void *arg) { - return _hypercall2(int, memory_op, cmd, arg); + return _hypercall2(long, memory_op, cmd, arg); } static inline int |
