summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-09-12 17:45:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-09-12 17:45:27 -0700
commitfc486b03cae382601b366ab460b05e1a01bf69cd (patch)
tree4b7bcb5ddebfc24662bad6eda9b6f3c9a515df10 /include
parent471cff7c42b56dbbd69003c25bbd97cf6776d464 (diff)
parentd50582e06fd5a58281151e097ff68b02ca65cf2d (diff)
downloadlinux-fc486b03cae382601b366ab460b05e1a01bf69cd.tar.bz2
Merge tag 'stable/for-linus-3.17-b-rc4-arm-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull Xen ARM bugfix from Stefano Stabellini: "The patches fix the "xen_add_mach_to_phys_entry: cannot add" bug that has been affecting xen on arm and arm64 guests since 3.16. They require a few hypervisor side changes that just went in xen-unstable. A couple of days ago David sent out a pull request with a few other Xen fixes (it is already in master). Sorry we didn't synchronized better among us" * tag 'stable/for-linus-3.17-b-rc4-arm-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: xen/arm: remove mach_to_phys rbtree xen/arm: reimplement xen_dma_unmap_page & friends xen/arm: introduce XENFEAT_grant_map_identity
Diffstat (limited to 'include')
-rw-r--r--include/xen/interface/features.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/xen/interface/features.h b/include/xen/interface/features.h
index 131a6ccdba25..14334d0161d5 100644
--- a/include/xen/interface/features.h
+++ b/include/xen/interface/features.h
@@ -53,6 +53,9 @@
/* operation as Dom0 is supported */
#define XENFEAT_dom0 11
+/* Xen also maps grant references at pfn = mfn */
+#define XENFEAT_grant_map_identity 12
+
#define XENFEAT_NR_SUBMAPS 1
#endif /* __XEN_PUBLIC_FEATURES_H__ */