diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 13:20:06 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 13:20:06 +1100 |
| commit | c2e4cc9aaeb5d8e9fd6b686ecfc8f1b88fcd9123 (patch) | |
| tree | cec0fb39952ea78d4c101f6e2658db596a1574a4 /arch/arm | |
| parent | cc9acb2789eddcdebda5334fbb4e08c244ba5b06 (diff) | |
| parent | 4610d240d691768203fdd210a5da0a2e02eddb76 (diff) | |
Merge remote-tracking branch 'xen-tip/linux-next'
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/xen/enlighten.c | 1 | ||||
| -rw-r--r-- | arch/arm/xen/hypercall.S | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 11d9f2898b16..81e3217b12d3 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -457,4 +457,5 @@ EXPORT_SYMBOL_GPL(HYPERVISOR_tmem_op); EXPORT_SYMBOL_GPL(HYPERVISOR_platform_op); EXPORT_SYMBOL_GPL(HYPERVISOR_multicall); EXPORT_SYMBOL_GPL(HYPERVISOR_vm_assist); +EXPORT_SYMBOL_GPL(HYPERVISOR_dm_op); EXPORT_SYMBOL_GPL(privcmd_call); diff --git a/arch/arm/xen/hypercall.S b/arch/arm/xen/hypercall.S index a648dfc3be30..b0b80c0f09f3 100644 --- a/arch/arm/xen/hypercall.S +++ b/arch/arm/xen/hypercall.S @@ -92,6 +92,7 @@ HYPERCALL1(tmem_op); HYPERCALL1(platform_op_raw); HYPERCALL2(multicall); HYPERCALL2(vm_assist); +HYPERCALL3(dm_op); ENTRY(privcmd_call) stmdb sp!, {r4} |