diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-26 20:37:45 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-26 20:37:45 +0300 |
commit | 8e47c5f0e23234659daea78256bc1b04ea019a4b (patch) | |
tree | 54685b78c58b3e245a30a596950969027e16aec4 /arch/arm/include | |
parent | 31a24ae89c92d5533c049046a76c6a2d649efb72 (diff) | |
parent | f5079a9a2a31607a2343e544e9182ce35b030578 (diff) | |
download | linux-8e47c5f0e23234659daea78256bc1b04ea019a4b.tar.xz |
Merge tag 'for-linus-5.13-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen updates from Juergen Gross:
- remove some PV ACPI cpu/memory hotplug code which has been broken for
a long time
- support direct mapped guests (other than dom0) on Arm
- several small fixes and cleanups
* tag 'for-linus-5.13-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/arm: introduce XENFEAT_direct_mapped and XENFEAT_not_direct_mapped
xen-pciback: simplify vpci's find hook
xen-blkfront: Fix 'physical' typos
xen-blkback: fix compatibility bug with single page rings
xen: Remove support for PV ACPI cpu/memory hotplug
xen/pciback: Fix incorrect type warnings
Diffstat (limited to 'arch/arm/include')
-rw-r--r-- | arch/arm/include/asm/xen/swiotlb-xen.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/xen/swiotlb-xen.h b/arch/arm/include/asm/xen/swiotlb-xen.h new file mode 100644 index 000000000000..455ade5d5320 --- /dev/null +++ b/arch/arm/include/asm/xen/swiotlb-xen.h @@ -0,0 +1 @@ +#include <xen/arm/swiotlb-xen.h> |