diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 17:27:25 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 17:27:25 +1100 |
| commit | 2276d29be63af7936cd4fab91e4b350ac5ccbbc1 (patch) | |
| tree | 7487490a3fbba10b4c632bfc218b868ce465f0d8 /arch | |
| parent | b3eab1d6a437c6332f90c039a75287cbef02ecf1 (diff) | |
| parent | 5231e92e133d6db6681a4485b1794a01469ca9ad (diff) | |
Merge remote-tracking branch 'cleancache/linux-next'
Conflicts:
fs/ocfs2/super.c
fs/super.c
include/linux/fs.h
mm/Kconfig
Diffstat (limited to 'arch')
| -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 8508bfe52296..d240ea950519 100644 --- a/arch/x86/include/asm/xen/hypercall.h +++ b/arch/x86/include/asm/xen/hypercall.h @@ -447,6 +447,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) { |