Commit 16984ce1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2cb7b5a3 176455e9

arch/arm/include/asm/xen/hypercall.h

+1 −0
Original line number Diff line number Diff line
@@ -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,

arch/arm/xen/enlighten.c

+1 −0
Original line number Diff line number Diff line
@@ -314,4 +314,5 @@ EXPORT_SYMBOL_GPL(HYPERVISOR_hvm_op); 
EXPORT_SYMBOL_GPL(HYPERVISOR_memory_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_physdev_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_vcpu_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_tmem_op);

EXPORT_SYMBOL_GPL(privcmd_call);

arch/arm/xen/hypercall.S

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ HYPERCALL2(hvm_op); 
HYPERCALL2(memory_op);

HYPERCALL2(physdev_op);

HYPERCALL3(vcpu_op);

HYPERCALL1(tmem_op);



ENTRY(privcmd_call)

	stmdb sp!, {r4}

arch/arm64/xen/hypercall.S

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ HYPERCALL2(hvm_op); 
HYPERCALL2(memory_op);

HYPERCALL2(physdev_op);

HYPERCALL3(vcpu_op);

HYPERCALL1(tmem_op);



ENTRY(privcmd_call)

	mov x16, x0

CRA Git | Maintained and supported by SUSTech CRA and CCSE