diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 13:50:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 13:50:56 -0400 |
| commit | f8d613e2a665bf1be9628a3c3f9bafe7599b32c0 (patch) | |
| tree | 98d4da8d0e1a5fb1d9064626b4b96d95ccf26375 /arch | |
| parent | 8a0599dd2471f2a2e409498c08a0ab339057ad06 (diff) | |
| parent | 5bc20fc59706214d9591c11e1938a629d3538c12 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem:
xen: cleancache shim to Xen Transcendent Memory
ocfs2: add cleancache support
ext4: add cleancache support
btrfs: add cleancache support
ext3: add cleancache support
mm/fs: add hooks to support cleancache
mm: cleancache core ops functions and config
fs: add field to superblock to support cleancache
mm/fs: cleancache documentation
Fix up trivial conflict in fs/btrfs/extent_io.c due to includes
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) | |||
| 447 | return _hypercall2(unsigned long, hvm_op, op, arg); | 447 | return _hypercall2(unsigned long, hvm_op, op, arg); |
| 448 | } | 448 | } |
| 449 | 449 | ||
| 450 | static inline int | ||
| 451 | HYPERVISOR_tmem_op( | ||
| 452 | struct tmem_op *op) | ||
| 453 | { | ||
| 454 | return _hypercall1(int, tmem_op, op); | ||
| 455 | } | ||
| 456 | |||
| 450 | static inline void | 457 | static inline void |
| 451 | MULTI_fpu_taskswitch(struct multicall_entry *mcl, int set) | 458 | MULTI_fpu_taskswitch(struct multicall_entry *mcl, int set) |
| 452 | { | 459 | { |