diff options
| author | Will Deacon <will@kernel.org> | 2023-04-20 11:22:33 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2023-04-20 11:22:33 +0100 |
| commit | 1bb31cc7afe6b1524d1cd74a1ed53c1add16fc73 (patch) | |
| tree | 9f9870383e4754ab0a6129d167bc445b98788ff8 /arch/arm64/include/asm/uaccess.h | |
| parent | 81444b77a4443e985b567310f19d601368ed4762 (diff) | |
| parent | 414c109bdf496195269bc03d40841fe67fc2f839 (diff) | |
Merge branch 'for-next/mm' into for-next/core
* for-next/mm:
arm64: mm: always map fixmap at page granularity
arm64: mm: move fixmap code to its own file
arm64: add FIXADDR_TOT_{START,SIZE}
Revert "Revert "arm64: dma: Drop cache invalidation from arch_dma_prep_coherent()""
arm: uaccess: Remove memcpy_page_flushcache()
mm,kfence: decouple kfence from page granularity mapping judgement
Diffstat (limited to 'arch/arm64/include/asm/uaccess.h')
| -rw-r--r-- | arch/arm64/include/asm/uaccess.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h index deaf4f8f0672..8209e6a86989 100644 --- a/arch/arm64/include/asm/uaccess.h +++ b/arch/arm64/include/asm/uaccess.h @@ -449,8 +449,6 @@ extern long strncpy_from_user(char *dest, const char __user *src, long count); extern __must_check long strnlen_user(const char __user *str, long n); #ifdef CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE -struct page; -void memcpy_page_flushcache(char *to, struct page *page, size_t offset, size_t len); extern unsigned long __must_check __copy_user_flushcache(void *to, const void __user *from, unsigned long n); static inline int __copy_from_user_flushcache(void *dst, const void __user *src, unsigned size) |