Skip to content

Commit

Permalink
arm64: Avoid unnecessary clear_user_page() indirection
Browse files Browse the repository at this point in the history
Since clear_user_page() calls clear_page() directly, avoid the
unnecessary indirection.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
  • Loading branch information
Catalin Marinas committed Sep 4, 2020
1 parent 2563776 commit 738c878
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
3 changes: 1 addition & 2 deletions arch/arm64/include/asm/page.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
struct page;
struct vm_area_struct;

extern void __cpu_clear_user_page(void *p, unsigned long user);
extern void copy_page(void *to, const void *from);
extern void clear_page(void *to);

Expand All @@ -33,7 +32,7 @@ void copy_highpage(struct page *to, struct page *from);
alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr)
#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE

#define clear_user_page(addr,vaddr,pg) __cpu_clear_user_page(addr, vaddr)
#define clear_user_page(page, vaddr, pg) clear_page(page)
#define copy_user_page(to, from, vaddr, pg) copy_page(to, from)

typedef struct page *pgtable_t;
Expand Down
6 changes: 0 additions & 6 deletions arch/arm64/mm/copypage.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,3 @@ void copy_user_highpage(struct page *to, struct page *from,
flush_dcache_page(to);
}
EXPORT_SYMBOL_GPL(copy_user_highpage);

void __cpu_clear_user_page(void *kaddr, unsigned long vaddr)
{
clear_page(kaddr);
}
EXPORT_SYMBOL_GPL(__cpu_clear_user_page);

0 comments on commit 738c878

Please sign in to comment.