unicore32: mm: Add missing parameter to arch_vma_access_permitted

groeck · groeck · commit 783011b13095 · 2016-08-13T08:53:18.000-07:00
unicore32 fails to compile with the following errors. mm/memory.c: In function ‘__handle_mm_fault’: mm/memory.c:3381: error: too many arguments to function ‘arch_vma_access_permitted’ mm/gup.c: In function ‘check_vma_flags’: mm/gup.c:456: error: too many arguments to function ‘arch_vma_access_permitted’ mm/gup.c: In function ‘vma_permits_fault’: mm/gup.c:640: error: too many arguments to function ‘arch_vma_access_permitted’ Fixes: d61172b ("mm/core, x86/mm/pkeys: Differentiate instruction fetches") Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@kernel.org> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
diff --git a/arch/unicore32/include/asm/mmu_context.h b/arch/unicore32/include/asm/mmu_context.h
@@ -98,7 +98,7 @@ static inline void arch_bprm_mm_init(struct mm_struct *mm,
 }
 
 static inline bool arch_vma_access_permitted(struct vm_area_struct *vma,
-		bool write, bool foreign)
+		bool write, bool execute, bool foreign)
 {
 	/* by default, allow everything */
 	return true;

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ static inline void arch_bprm_mm_init(struct mm_struct *mm,`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`static inline bool arch_vma_access_permitted(struct vm_area_struct *vma,`
`101`		`- bool write, bool foreign)`
	`101`	`+ bool write, bool execute, bool foreign)`
`102`	`102`	`{`
`103`	`103`	`/* by default, allow everything */`
`104`	`104`	`return true;`