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/microblaze/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/microblaze/include')
| -rw-r--r-- | arch/microblaze/include/asm/pgtable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h index 72708f9af1c0..b10273a3d0a4 100644 --- a/arch/microblaze/include/asm/pgtable.h +++ b/arch/microblaze/include/asm/pgtable.h @@ -14,6 +14,7 @@ extern int mem_init_done; #endif +#include <asm/page.h> #include <asm-generic/pgtable-nopmd.h> #ifdef __KERNEL__ @@ -23,7 +24,6 @@ extern int mem_init_done; #include <linux/threads.h> #include <asm/processor.h> /* For TASK_SIZE */ #include <asm/mmu.h> -#include <asm/page.h> extern unsigned long va_to_phys(unsigned long address); extern pte_t *va_to_pte(unsigned long address); |