git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'upstream-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw...
[sfrench/cifs-2.6.git]
/
include
/
xen
/
xen.h
diff --git
a/include/xen/xen.h
b/include/xen/xen.h
index 0e2156786ad29ff1645269377e9d794dfb2aaada..19d032373de5a8d1c36a58145678defa018ef906 100644
(file)
--- a/
include/xen/xen.h
+++ b/
include/xen/xen.h
@@
-46,4
+46,8
@@
struct bio_vec;
bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,
const struct bio_vec *vec2);
+#if defined(CONFIG_MEMORY_HOTPLUG) && defined(CONFIG_XEN_BALLOON)
+extern u64 xen_saved_max_mem_size;
+#endif
+
#endif /* _XEN_XEN_H */