diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 23:15:05 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 23:15:05 -0500 |
| commit | 403299a8515c56db58454c57712f4dc96d6c1fde (patch) | |
| tree | 1dbcb33c606b03adc7d7fe128ecb3f0c3404ffef /include/xen/interface/xen.h | |
| parent | daedd8708fe7707ed651bb1c83162f25c48a947c (diff) | |
| parent | fdb9eb9f155bfc0f8dc2fc88f90448b30c78ad97 (diff) | |
Merge branch 'upstream/xen-settime' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
* 'upstream/xen-settime' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
xen/dom0: set wallclock time in Xen
xen: add dom0_op hypercall
xen/acpi: Domain0 acpi parser related platform hypercall
Diffstat (limited to 'include/xen/interface/xen.h')
| -rw-r--r-- | include/xen/interface/xen.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h index 6acd9cefd517..6a6e91449347 100644 --- a/include/xen/interface/xen.h +++ b/include/xen/interface/xen.h | |||
| @@ -492,6 +492,7 @@ struct dom0_vga_console_info { | |||
| 492 | /* These flags are passed in the 'flags' field of start_info_t. */ | 492 | /* These flags are passed in the 'flags' field of start_info_t. */ |
| 493 | #define SIF_PRIVILEGED (1<<0) /* Is the domain privileged? */ | 493 | #define SIF_PRIVILEGED (1<<0) /* Is the domain privileged? */ |
| 494 | #define SIF_INITDOMAIN (1<<1) /* Is this the initial control domain? */ | 494 | #define SIF_INITDOMAIN (1<<1) /* Is this the initial control domain? */ |
| 495 | #define SIF_PM_MASK (0xFF<<8) /* reserve 1 byte for xen-pm options */ | ||
| 495 | 496 | ||
| 496 | typedef uint64_t cpumap_t; | 497 | typedef uint64_t cpumap_t; |
| 497 | 498 | ||