summaryrefslogtreecommitdiff
path: root/include/xen
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-07-08 23:07:30 +0400
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-07-08 23:07:30 +0400
commit136d9ebff300044865693a57d68fe5905635992a (patch)
tree1a336de0e43c499c8b51475cca3afb52b8d1499d /include/xen
parent149bb2fab547253e6359e76f1b86b95247110e68 (diff)
parenta50777c791031d7345ce95785ea6220f67339d90 (diff)
downloadlinux-136d9ebff300044865693a57d68fe5905635992a.tar.xz
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.h10
-rw-r--r--include/xen/tmem.h5
2 files changed, 15 insertions, 0 deletions
diff --git a/include/xen/balloon.h b/include/xen/balloon.h
index a2b22f01a51d..4076ed72afbd 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 000000000000..82e2c83a32f5
--- /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 */