diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 14:06:21 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 14:06:21 +1100 |
| commit | ab319c034f3ee5f7695a8082cc327e91a1d4ecb9 (patch) | |
| tree | cea21726aefd0fcad6994e47c805b8ba422e2e45 /include/xen/interface/elfnote.h | |
| parent | c69ce9183b9ceaeaa3bd916b2aa3f328ee68869b (diff) | |
| parent | b1a3b1c8a8d963424c4699efa64dd8986b2f76d7 (diff) | |
Merge remote-tracking branch 'xen-tip/linux-next'
Conflicts:
arch/arm/include/asm/xen/page.h
Diffstat (limited to 'include/xen/interface/elfnote.h')
| -rw-r--r-- | include/xen/interface/elfnote.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/xen/interface/elfnote.h b/include/xen/interface/elfnote.h index 0360b15f4883..6f4eae328ca7 100644 --- a/include/xen/interface/elfnote.h +++ b/include/xen/interface/elfnote.h @@ -140,6 +140,19 @@ */ #define XEN_ELFNOTE_SUSPEND_CANCEL 14 +/* + * The features supported by this kernel (numeric). + * + * Other than XEN_ELFNOTE_FEATURES on pre-4.2 Xen, this note allows a + * kernel to specify support for features that older hypervisors don't + * know about. The set of features 4.2 and newer hypervisors will + * consider supported by the kernel is the combination of the sets + * specified through this and the string note. + * + * LEGACY: FEATURES + */ +#define XEN_ELFNOTE_SUPPORTED_FEATURES 17 + #endif /* __XEN_PUBLIC_ELFNOTE_H__ */ /* |