summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-06-04 13:42:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2022-06-04 13:42:53 -0700
commit4ccbe91de91a8f9559052179d15c0229a8ac9f8a (patch)
tree457402698719b0d71556b2f12dd16df567313ab8 /arch
parent45b2e5ad6837dfe4de6b9028c575bd57c132774c (diff)
parent41925b105e345ebc84cedb64f59d20cb14a62613 (diff)
downloadlinux-stable-4ccbe91de91a8f9559052179d15c0229a8ac9f8a.tar.gz
linux-stable-4ccbe91de91a8f9559052179d15c0229a8ac9f8a.tar.bz2
linux-stable-4ccbe91de91a8f9559052179d15c0229a8ac9f8a.zip
Merge tag 'for-linus-5.19-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull more xen updates from Juergen Gross: "Two cleanup patches for Xen related code and (more important) an update of MAINTAINERS for Xen, as Boris Ostrovsky decided to step down" * tag 'for-linus-5.19-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: xen: replace xen_remap() with memremap() MAINTAINERS: Update Xen maintainership xen: switch gnttab_end_foreign_access() to take a struct page pointer
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/include/asm/xen/page.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
index 1fc67df50014..fa9ec20783fa 100644
--- a/arch/x86/include/asm/xen/page.h
+++ b/arch/x86/include/asm/xen/page.h
@@ -347,9 +347,6 @@ unsigned long arbitrary_virt_to_mfn(void *vaddr);
void make_lowmem_page_readonly(void *vaddr);
void make_lowmem_page_readwrite(void *vaddr);
-#define xen_remap(cookie, size) ioremap((cookie), (size))
-#define xen_unmap(cookie) iounmap((cookie))
-
static inline bool xen_arch_need_swiotlb(struct device *dev,
phys_addr_t phys,
dma_addr_t dev_addr)