diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-02-11 15:42:39 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-02-11 15:42:39 +1100 |
| commit | f26e68f02f3dfc86517121aac1787a4f75bfbf3c (patch) | |
| tree | ada7ce4ea5426d641ac6a616a4bb61a7c11ef663 /arch/x86/include/asm/xen | |
| parent | 840a26f0e960c30f1fce6614798b814f71c9135b (diff) | |
| parent | 5231e92e133d6db6681a4485b1794a01469ca9ad (diff) | |
Merge remote branch 'cleancache/linux-next'
Conflicts:
fs/ocfs2/super.c
fs/super.c
include/linux/fs.h
mm/Kconfig
Diffstat (limited to 'arch/x86/include/asm/xen')
| -rw-r--r-- | arch/x86/include/asm/xen/hypercall.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h index a3c28ae4025b..592d955aff2e 100644 --- a/arch/x86/include/asm/xen/hypercall.h +++ b/arch/x86/include/asm/xen/hypercall.h @@ -440,6 +440,13 @@ HYPERVISOR_hvm_op(int op, void *arg) return _hypercall2(unsigned long, hvm_op, op, arg); } +static inline int +HYPERVISOR_tmem_op( + struct tmem_op *op) +{ + return _hypercall1(int, tmem_op, op); +} + static inline void MULTI_fpu_taskswitch(struct multicall_entry *mcl, int set) { |