diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 20:15:05 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 20:15:05 -0800 |
commit | 403299a8515c56db58454c57712f4dc96d6c1fde (patch) | |
tree | 1dbcb33c606b03adc7d7fe128ecb3f0c3404ffef /arch/x86/include/asm/xen/interface.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 'arch/x86/include/asm/xen/interface.h')
-rw-r--r-- | arch/x86/include/asm/xen/interface.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/xen/interface.h b/arch/x86/include/asm/xen/interface.h index 5d4922ad4b9..a1f2db5f117 100644 --- a/arch/x86/include/asm/xen/interface.h +++ b/arch/x86/include/asm/xen/interface.h @@ -55,6 +55,7 @@ DEFINE_GUEST_HANDLE(char); DEFINE_GUEST_HANDLE(int); DEFINE_GUEST_HANDLE(long); DEFINE_GUEST_HANDLE(void); +DEFINE_GUEST_HANDLE(uint64_t); #endif #ifndef HYPERVISOR_VIRT_START |