diff options
| author | Juergen Gross <jgross@suse.com> | 2015-01-21 08:49:23 +0100 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2015-03-16 14:49:13 +0000 |
| commit | 16b12d605795e775cd80b5901c85dd2e320a6ec2 (patch) | |
| tree | 280e031837ac1f3211efd4bfc821cd1978332227 | |
| parent | 9b4ade226f7468bb26f98b6cd01cb5b8a05fc96d (diff) | |
| download | linux-stable-16b12d605795e775cd80b5901c85dd2e320a6ec2.tar.gz linux-stable-16b12d605795e775cd80b5901c85dd2e320a6ec2.tar.bz2 linux-stable-16b12d605795e775cd80b5901c85dd2e320a6ec2.zip | |
xen: synchronize include/xen/interface/xen.h with xen
The header include/xen/interface/xen.h doesn't contain all definitions
from Xen's version of that header. Update it accordingly.
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: David Vrabel <david.vrabel@citrix.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
| -rw-r--r-- | arch/x86/xen/trace.c | 2 | ||||
| -rw-r--r-- | include/xen/interface/xen.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/x86/xen/trace.c b/arch/x86/xen/trace.c index 520022d1a181..8296cdf4e581 100644 --- a/arch/x86/xen/trace.c +++ b/arch/x86/xen/trace.c @@ -29,7 +29,7 @@ static const char *xen_hypercall_names[] = { N(vcpu_op), N(set_segment_base), N(mmuext_op), - N(acm_op), + N(xsm_op), N(nmi_op), N(sched_op), N(callback_op), diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h index f68719f405af..a48378958062 100644 --- a/include/xen/interface/xen.h +++ b/include/xen/interface/xen.h @@ -67,7 +67,7 @@ #define __HYPERVISOR_vcpu_op 24 #define __HYPERVISOR_set_segment_base 25 /* x86/64 only */ #define __HYPERVISOR_mmuext_op 26 -#define __HYPERVISOR_acm_op 27 +#define __HYPERVISOR_xsm_op 27 #define __HYPERVISOR_nmi_op 28 #define __HYPERVISOR_sched_op 29 #define __HYPERVISOR_callback_op 30 @@ -75,7 +75,11 @@ #define __HYPERVISOR_event_channel_op 32 #define __HYPERVISOR_physdev_op 33 #define __HYPERVISOR_hvm_op 34 +#define __HYPERVISOR_sysctl 35 +#define __HYPERVISOR_domctl 36 +#define __HYPERVISOR_kexec_op 37 #define __HYPERVISOR_tmem_op 38 +#define __HYPERVISOR_xc_reserved_op 39 /* reserved for XenClient */ /* Architecture-specific hypercall definitions. */ #define __HYPERVISOR_arch_0 48 |