diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2013-06-12 16:11:35 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2013-06-12 16:11:35 +0100 |
| commit | d822d2a1e33144967b01f9535ce217639aa75279 (patch) | |
| tree | e6d93143b55a66f607493cf9d3c06b5cc79ac62b /include/xen | |
| parent | 1442b6ed249d2b3d2cfcf45b65ac64393495c96c (diff) | |
| parent | b475e83f4653e43880a07c7daaa8c58d9237135d (diff) | |
| download | op-kernel-dev-d822d2a1e33144967b01f9535ce217639aa75279.zip op-kernel-dev-d822d2a1e33144967b01f9535ce217639aa75279.tar.gz | |
Merge tag 'xen-arm64-3.1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen into upstream
Introduce Xen support to ARM64
* tag 'xen-arm64-3.1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen:
MAINTAINERS: add myself as arm64/xen maintainer
arm64/xen: introduce CONFIG_XEN and hypercall.S on ARM64
arm64/xen: use XEN_IO_PROTO_ABI_ARM on ARM64
arm64/xen: implement ioremap_cached on arm64
arm64/xen: introduce asm/xen header files on arm64
arm/xen: define xen_remap as ioremap_cached
Diffstat (limited to 'include/xen')
| -rw-r--r-- | include/xen/interface/io/protocols.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/xen/interface/io/protocols.h b/include/xen/interface/io/protocols.h index 0eafaf2..056744b 100644 --- a/include/xen/interface/io/protocols.h +++ b/include/xen/interface/io/protocols.h @@ -15,7 +15,7 @@ # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_IA64 #elif defined(__powerpc64__) # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_POWERPC64 -#elif defined(__arm__) +#elif defined(__arm__) || defined(__aarch64__) # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_ARM #else # error arch fixup needed here |
