diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-14 15:14:36 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-14 15:14:36 +0100 |
| commit | 6fbefa4e81780e7e372c19e31cd33cc2456b230f (patch) | |
| tree | 79178a0b363a4673ff0c859b25d0d20d890fc234 /arch/powerpc/include/asm | |
| parent | 9c513523039dc8ee83f8f527acdcbc7a792d83bc (diff) | |
| parent | e02cb91d4644dfff593146f89e70d2008cc6ac16 (diff) | |
| download | linux-next-6fbefa4e81780e7e372c19e31cd33cc2456b230f.tar.gz linux-next-6fbefa4e81780e7e372c19e31cd33cc2456b230f.zip | |
Merge branch 'headers' of git://git.infradead.org/users/willy/pagecache.git
# Conflicts:
# drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
# net/ceph/osd_client.c
Diffstat (limited to 'arch/powerpc/include/asm')
| -rw-r--r-- | arch/powerpc/include/asm/tlb.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/tlb.h b/arch/powerpc/include/asm/tlb.h index 1ca7d4c4b90d..7ee22249148b 100644 --- a/arch/powerpc/include/asm/tlb.h +++ b/arch/powerpc/include/asm/tlb.h @@ -17,8 +17,6 @@ #include <asm/mmu.h> #endif -#include <linux/pagemap.h> - static inline void __tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep, unsigned long address); #define __tlb_remove_tlb_entry __tlb_remove_tlb_entry |