Merge tag 'fixes-for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

torvalds · torvalds · commit 118253a593bd · 2016-08-13T19:39:38.000-07:00
Pull h8300 and unicore32 architecture fixes from Guenter Roeck:
 "Two patches to fix h8300 and unicore32 builds.

  unicore32 builds have been broken since v4.6.  The fix has been
  available in -next since March of this year.

  h8300 builds have been broken since the last commit window.  The fix
  has been available in -next since June of this year"

* tag 'fixes-for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  h8300: Add missing include file to asm/io.h
  unicore32: mm: Add missing parameter to arch_vma_access_permitted
diff --git a/arch/h8300/include/asm/io.h b/arch/h8300/include/asm/io.h
@@ -3,6 +3,8 @@
 
 #ifdef __KERNEL__
 
+#include <linux/types.h>
+
 /* H8/300 internal I/O functions */
 
 #define __raw_readb __raw_readb
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;`