summaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-06 12:38:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-06 12:38:42 -0700
commit16984ce15ea43e17d964ece55ce336a8a4f40750 (patch)
treea21e760c975b14b772ed44faa50ad9f7232743b0 /arch/arm/include
parent2cb7b5a38c45b48e9ffb8b382c675a4d64ecccde (diff)
parent176455e9a9e2a37a0b3eec6f6d7883de720c02c7 (diff)
downloadblackbird-op-linux-16984ce15ea43e17d964ece55ce336a8a4f40750.tar.gz
blackbird-op-linux-16984ce15ea43e17d964ece55ce336a8a4f40750.zip
Merge tag 'xenarm-for-3.11-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen
Pull Xen ARM update rom Stefano Stabellini: "Just one commit this time: the implementation of the tmem hypercall for arm and arm64" * tag 'xenarm-for-3.11-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen: xen/arm and xen/arm64: implement HYPERVISOR_tmem_op
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/xen/hypercall.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/xen/hypercall.h b/arch/arm/include/asm/xen/hypercall.h
index 799f42ecca63..7704e28c3483 100644
--- a/arch/arm/include/asm/xen/hypercall.h
+++ b/arch/arm/include/asm/xen/hypercall.h
@@ -47,6 +47,7 @@ unsigned long HYPERVISOR_hvm_op(int op, void *arg);
int HYPERVISOR_memory_op(unsigned int cmd, void *arg);
int HYPERVISOR_physdev_op(int cmd, void *arg);
int HYPERVISOR_vcpu_op(int cmd, int vcpuid, void *extra_args);
+int HYPERVISOR_tmem_op(void *arg);
static inline void
MULTI_update_va_mapping(struct multicall_entry *mcl, unsigned long va,
OpenPOWER on IntegriCloud