Skip to content

Commit 34bde7f

Browse files
arndbRussell King (Oracle)
authored andcommitted
ARM: 9305/1: add clear/copy_user_highpage declarations
The CPU specific helpers have to be global functions when building a kernel for just one CPU, but are called through indirect function pointers in a multi-CPU kernel. This config currently lacks the declarations for the individual helpers, e.g.: arch/arm/mm/copypage-v4wb.c:47:6: error: no previous prototype for 'v4wb_copy_user_highpage' [-Werror=missing-prototypes] arch/arm/mm/copypage-v4wb.c:65:6: error: no previous prototype for 'v4wb_clear_user_highpage' [-Werror=missing-prototypes] Add the complete set of prototypes in asm/page.h to allow building iwth -Wmissing-prototypes. Reviewed-by: Kees Cook <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Russell King (Oracle) <[email protected]>
1 parent ae1f8d7 commit 34bde7f

File tree

1 file changed

+22
-0
lines changed

1 file changed

+22
-0
lines changed

arch/arm/include/asm/page.h

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,28 @@ struct cpu_user_fns {
113113
unsigned long vaddr, struct vm_area_struct *vma);
114114
};
115115

116+
void fa_copy_user_highpage(struct page *to, struct page *from,
117+
unsigned long vaddr, struct vm_area_struct *vma);
118+
void fa_clear_user_highpage(struct page *page, unsigned long vaddr);
119+
void feroceon_copy_user_highpage(struct page *to, struct page *from,
120+
unsigned long vaddr, struct vm_area_struct *vma);
121+
void feroceon_clear_user_highpage(struct page *page, unsigned long vaddr);
122+
void v4_mc_copy_user_highpage(struct page *to, struct page *from,
123+
unsigned long vaddr, struct vm_area_struct *vma);
124+
void v4_mc_clear_user_highpage(struct page *page, unsigned long vaddr);
125+
void v4wb_copy_user_highpage(struct page *to, struct page *from,
126+
unsigned long vaddr, struct vm_area_struct *vma);
127+
void v4wb_clear_user_highpage(struct page *page, unsigned long vaddr);
128+
void v4wt_copy_user_highpage(struct page *to, struct page *from,
129+
unsigned long vaddr, struct vm_area_struct *vma);
130+
void v4wt_clear_user_highpage(struct page *page, unsigned long vaddr);
131+
void xsc3_mc_copy_user_highpage(struct page *to, struct page *from,
132+
unsigned long vaddr, struct vm_area_struct *vma);
133+
void xsc3_mc_clear_user_highpage(struct page *page, unsigned long vaddr);
134+
void xscale_mc_copy_user_highpage(struct page *to, struct page *from,
135+
unsigned long vaddr, struct vm_area_struct *vma);
136+
void xscale_mc_clear_user_highpage(struct page *page, unsigned long vaddr);
137+
116138
#ifdef MULTI_USER
117139
extern struct cpu_user_fns cpu_user;
118140

0 commit comments

Comments
 (0)