aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-08-13 19:39:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-13 19:39:38 -0700
commit118253a593bd1c57de2d1193df1ccffe1abe745b (patch)
tree1a4d8d1c77ab7f70be97d467b1ad5719e02cc7cd
parent120c54751b1cecaa18b4e2f247f242af6ee87fd9 (diff)
parent2b05980d895e51fc46d3d27c8d1bcc696dddca99 (diff)
downloadlinux-yocto-4.8-118253a593bd1c57de2d1193df1ccffe1abe745b.tar.gz
linux-yocto-4.8-118253a593bd1c57de2d1193df1ccffe1abe745b.tar.bz2
linux-yocto-4.8-118253a593bd1c57de2d1193df1ccffe1abe745b.zip
Merge tag 'fixes-for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
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
-rw-r--r--arch/h8300/include/asm/io.h2
-rw-r--r--arch/unicore32/include/asm/mmu_context.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/h8300/include/asm/io.h b/arch/h8300/include/asm/io.h
index 2e221c5f0203..f86918aed9e1 100644
--- 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
index e35632ef23c7..62dfc644c908 100644
--- 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;