diff options
| author | Juergen Gross <jgross@suse.com> | 2015-01-21 02:49:23 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2015-03-16 10:49:13 -0400 |
| commit | 16b12d605795e775cd80b5901c85dd2e320a6ec2 (patch) | |
| tree | 280e031837ac1f3211efd4bfc821cd1978332227 | |
| parent | 9b4ade226f7468bb26f98b6cd01cb5b8a05fc96d (diff) | |
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[] = { | |||
| 29 | N(vcpu_op), | 29 | N(vcpu_op), |
| 30 | N(set_segment_base), | 30 | N(set_segment_base), |
| 31 | N(mmuext_op), | 31 | N(mmuext_op), |
| 32 | N(acm_op), | 32 | N(xsm_op), |
| 33 | N(nmi_op), | 33 | N(nmi_op), |
| 34 | N(sched_op), | 34 | N(sched_op), |
| 35 | N(callback_op), | 35 | 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 @@ | |||
| 67 | #define __HYPERVISOR_vcpu_op 24 | 67 | #define __HYPERVISOR_vcpu_op 24 |
| 68 | #define __HYPERVISOR_set_segment_base 25 /* x86/64 only */ | 68 | #define __HYPERVISOR_set_segment_base 25 /* x86/64 only */ |
| 69 | #define __HYPERVISOR_mmuext_op 26 | 69 | #define __HYPERVISOR_mmuext_op 26 |
| 70 | #define __HYPERVISOR_acm_op 27 | 70 | #define __HYPERVISOR_xsm_op 27 |
| 71 | #define __HYPERVISOR_nmi_op 28 | 71 | #define __HYPERVISOR_nmi_op 28 |
| 72 | #define __HYPERVISOR_sched_op 29 | 72 | #define __HYPERVISOR_sched_op 29 |
| 73 | #define __HYPERVISOR_callback_op 30 | 73 | #define __HYPERVISOR_callback_op 30 |
| @@ -75,7 +75,11 @@ | |||
| 75 | #define __HYPERVISOR_event_channel_op 32 | 75 | #define __HYPERVISOR_event_channel_op 32 |
| 76 | #define __HYPERVISOR_physdev_op 33 | 76 | #define __HYPERVISOR_physdev_op 33 |
| 77 | #define __HYPERVISOR_hvm_op 34 | 77 | #define __HYPERVISOR_hvm_op 34 |
| 78 | #define __HYPERVISOR_sysctl 35 | ||
| 79 | #define __HYPERVISOR_domctl 36 | ||
| 80 | #define __HYPERVISOR_kexec_op 37 | ||
| 78 | #define __HYPERVISOR_tmem_op 38 | 81 | #define __HYPERVISOR_tmem_op 38 |
| 82 | #define __HYPERVISOR_xc_reserved_op 39 /* reserved for XenClient */ | ||
| 79 | 83 | ||
| 80 | /* Architecture-specific hypercall definitions. */ | 84 | /* Architecture-specific hypercall definitions. */ |
| 81 | #define __HYPERVISOR_arch_0 48 | 85 | #define __HYPERVISOR_arch_0 48 |
