diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-06 15:38:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-06 15:38:42 -0400 |
| commit | 16984ce15ea43e17d964ece55ce336a8a4f40750 (patch) | |
| tree | a21e760c975b14b772ed44faa50ad9f7232743b0 /arch/arm64 | |
| parent | 2cb7b5a38c45b48e9ffb8b382c675a4d64ecccde (diff) | |
| parent | 176455e9a9e2a37a0b3eec6f6d7883de720c02c7 (diff) | |
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/arm64')
| -rw-r--r-- | arch/arm64/xen/hypercall.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/xen/hypercall.S b/arch/arm64/xen/hypercall.S index 2816c479cd49..531342ec4bcf 100644 --- a/arch/arm64/xen/hypercall.S +++ b/arch/arm64/xen/hypercall.S | |||
| @@ -79,6 +79,7 @@ HYPERCALL2(hvm_op); | |||
| 79 | HYPERCALL2(memory_op); | 79 | HYPERCALL2(memory_op); |
| 80 | HYPERCALL2(physdev_op); | 80 | HYPERCALL2(physdev_op); |
| 81 | HYPERCALL3(vcpu_op); | 81 | HYPERCALL3(vcpu_op); |
| 82 | HYPERCALL1(tmem_op); | ||
| 82 | 83 | ||
| 83 | ENTRY(privcmd_call) | 84 | ENTRY(privcmd_call) |
| 84 | mov x16, x0 | 85 | mov x16, x0 |