diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-07-08 15:07:30 -0400 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-07-08 15:07:30 -0400 |
| commit | 136d9ebff300044865693a57d68fe5905635992a (patch) | |
| tree | 1a336de0e43c499c8b51475cca3afb52b8d1499d /include/xen | |
| parent | 149bb2fab547253e6359e76f1b86b95247110e68 (diff) | |
| parent | a50777c791031d7345ce95785ea6220f67339d90 (diff) | |
| download | op-kernel-dev-136d9ebff300044865693a57d68fe5905635992a.zip op-kernel-dev-136d9ebff300044865693a57d68fe5905635992a.tar.gz | |
Merge branch 'xen-tmem-selfballoon-v8' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem into stable/drivers
* 'xen-tmem-selfballoon-v8' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem:
xen: tmem: self-ballooning and frontswap-selfshrinking
Diffstat (limited to 'include/xen')
| -rw-r--r-- | include/xen/balloon.h | 10 | ||||
| -rw-r--r-- | include/xen/tmem.h | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/include/xen/balloon.h b/include/xen/balloon.h index a2b22f0..4076ed7 100644 --- a/include/xen/balloon.h +++ b/include/xen/balloon.h @@ -23,3 +23,13 @@ void balloon_set_new_target(unsigned long target); int alloc_xenballooned_pages(int nr_pages, struct page** pages); void free_xenballooned_pages(int nr_pages, struct page** pages); + +struct sys_device; +#ifdef CONFIG_XEN_SELFBALLOONING +extern int register_xen_selfballooning(struct sys_device *sysdev); +#else +static inline int register_xen_selfballooning(struct sys_device *sysdev) +{ + return -ENOSYS; +} +#endif diff --git a/include/xen/tmem.h b/include/xen/tmem.h new file mode 100644 index 0000000..82e2c83 --- /dev/null +++ b/include/xen/tmem.h @@ -0,0 +1,5 @@ +#ifndef _XEN_TMEM_H +#define _XEN_TMEM_H +/* defined in drivers/xen/tmem.c */ +extern int tmem_enabled; +#endif /* _XEN_TMEM_H */ |
