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/sh/include | |
| 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/sh/include')
| -rw-r--r-- | arch/sh/include/asm/pgtable.h | 2 | ||||
| -rw-r--r-- | arch/sh/include/asm/tlb.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/sh/include/asm/pgtable.h b/arch/sh/include/asm/pgtable.h index d5ce0950a323..59244af775fd 100644 --- a/arch/sh/include/asm/pgtable.h +++ b/arch/sh/include/asm/pgtable.h @@ -9,12 +9,12 @@ #ifndef __ASM_SH_PGTABLE_H #define __ASM_SH_PGTABLE_H +#include <asm/page.h> #ifdef CONFIG_X2TLB #include <asm/pgtable-3level.h> #else #include <asm/pgtable-2level.h> #endif -#include <asm/page.h> #include <asm/mmu.h> #ifndef __ASSEMBLER__ diff --git a/arch/sh/include/asm/tlb.h b/arch/sh/include/asm/tlb.h index 39df40d0ebc2..6d07dae196f5 100644 --- a/arch/sh/include/asm/tlb.h +++ b/arch/sh/include/asm/tlb.h @@ -3,7 +3,6 @@ #define __ASM_SH_TLB_H #ifndef __ASSEMBLER__ -#include <linux/pagemap.h> #include <asm-generic/tlb.h> #ifdef CONFIG_MMU |