diff options
| author | Johan Hovold <johan@kernel.org> | 2014-09-15 12:07:37 -0400 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2014-09-15 12:10:34 -0400 |
| commit | 4b7154ba70bb20a3c024faabdd2bc207b550a813 (patch) | |
| tree | 99a6e1204ec5deaca27bcbfc75ca16d3633433f2 /include/xen/interface/features.h | |
| parent | adceac14166da8c466223a35ec59c4a4adeef976 (diff) | |
| parent | 9e82bf014195d6f0054982c463575cdce24292be (diff) | |
Merge tag 'v3.17-rc5' into usb-next
USB fixes in Linux 3.17-rc5 are needed to build on top of for 3.18.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'include/xen/interface/features.h')
| -rw-r--r-- | include/xen/interface/features.h | 3 |
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 @@ | |||
| 53 | /* operation as Dom0 is supported */ | 53 | /* operation as Dom0 is supported */ |
| 54 | #define XENFEAT_dom0 11 | 54 | #define XENFEAT_dom0 11 |
| 55 | 55 | ||
| 56 | /* Xen also maps grant references at pfn = mfn */ | ||
| 57 | #define XENFEAT_grant_map_identity 12 | ||
| 58 | |||
| 56 | #define XENFEAT_NR_SUBMAPS 1 | 59 | #define XENFEAT_NR_SUBMAPS 1 |
| 57 | 60 | ||
| 58 | #endif /* __XEN_PUBLIC_FEATURES_H__ */ | 61 | #endif /* __XEN_PUBLIC_FEATURES_H__ */ |