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/arc | |
| 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/arc')
| -rw-r--r-- | arch/arc/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/arc/include/asm/pgtable-levels.h | 2 | ||||
| -rw-r--r-- | arch/arc/include/asm/tlb.h | 12 |
3 files changed, 3 insertions, 12 deletions
diff --git a/arch/arc/include/asm/Kbuild b/arch/arc/include/asm/Kbuild index 483caacc6988..5a8ad8b9ad53 100644 --- a/arch/arc/include/asm/Kbuild +++ b/arch/arc/include/asm/Kbuild @@ -6,5 +6,6 @@ generic-y += kvm_para.h generic-y += mcs_spinlock.h generic-y += parport.h generic-y += ring_buffer.h +generic-y += tlb.h generic-y += user.h generic-y += text-patching.h diff --git a/arch/arc/include/asm/pgtable-levels.h b/arch/arc/include/asm/pgtable-levels.h index 167b82fcfafe..7e16b7fa17bc 100644 --- a/arch/arc/include/asm/pgtable-levels.h +++ b/arch/arc/include/asm/pgtable-levels.h @@ -87,6 +87,8 @@ #ifndef __ASSEMBLER__ +#include <asm/page.h> + #if CONFIG_PGTABLE_LEVELS > 3 #include <asm-generic/pgtable-nop4d.h> #elif CONFIG_PGTABLE_LEVELS > 2 diff --git a/arch/arc/include/asm/tlb.h b/arch/arc/include/asm/tlb.h deleted file mode 100644 index 975b35d3738d..000000000000 --- a/arch/arc/include/asm/tlb.h +++ /dev/null @@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com) - */ - -#ifndef _ASM_ARC_TLB_H -#define _ASM_ARC_TLB_H - -#include <linux/pagemap.h> -#include <asm-generic/tlb.h> - -#endif /* _ASM_ARC_TLB_H */ |