The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 16854b567dff767e5ec5e6dc23021271136733a5 Gitweb: https://git.kernel.org/tip/16854b567dff767e5ec5e6dc23021271136733a5 Author: Jan Kiszka <jan.kiszka@xxxxxxxxxxx> AuthorDate: Mon, 26 Oct 2020 18:39:06 +01:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Wed, 14 Apr 2021 08:21:41 +02:00 x86/pat: Do not compile stubbed functions when X86_PAT is off Those are already provided by linux/io.h as stubs. The conflict remains invisible until someone would pull linux/io.h into memtype.c. This fixes a build error when this file is used outside of the kernel tree. [ bp: Massage commit message. ] Signed-off-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Link: https://lkml.kernel.org/r/a9351615-7a0d-9d47-af65-d9e2fffe8192@xxxxxxxxxxx --- arch/x86/mm/pat/memtype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/mm/pat/memtype.c b/arch/x86/mm/pat/memtype.c index 6084d14..3112ca7 100644 --- a/arch/x86/mm/pat/memtype.c +++ b/arch/x86/mm/pat/memtype.c @@ -800,6 +800,7 @@ void memtype_free_io(resource_size_t start, resource_size_t end) memtype_free(start, end); } +#ifdef CONFIG_X86_PAT int arch_io_reserve_memtype_wc(resource_size_t start, resource_size_t size) { enum page_cache_mode type = _PAGE_CACHE_MODE_WC; @@ -813,6 +814,7 @@ void arch_io_free_memtype_wc(resource_size_t start, resource_size_t size) memtype_free_io(start, start + size); } EXPORT_SYMBOL(arch_io_free_memtype_wc); +#endif pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, unsigned long size, pgprot_t vma_prot)
![]() |