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 /arch/ia64 | |
| 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 'arch/ia64')
| -rw-r--r-- | arch/ia64/include/asm/xen/interface.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/xen/interface.h b/arch/ia64/include/asm/xen/interface.h index e951e740bdf2..1d2427d116e3 100644 --- a/arch/ia64/include/asm/xen/interface.h +++ b/arch/ia64/include/asm/xen/interface.h | |||
| @@ -76,6 +76,7 @@ DEFINE_GUEST_HANDLE(char); | |||
| 76 | DEFINE_GUEST_HANDLE(int); | 76 | DEFINE_GUEST_HANDLE(int); |
| 77 | DEFINE_GUEST_HANDLE(long); | 77 | DEFINE_GUEST_HANDLE(long); |
| 78 | DEFINE_GUEST_HANDLE(void); | 78 | DEFINE_GUEST_HANDLE(void); |
| 79 | DEFINE_GUEST_HANDLE(uint64_t); | ||
| 79 | 80 | ||
| 80 | typedef unsigned long xen_pfn_t; | 81 | typedef unsigned long xen_pfn_t; |
| 81 | DEFINE_GUEST_HANDLE(xen_pfn_t); | 82 | DEFINE_GUEST_HANDLE(xen_pfn_t); |