Commit 118253a5 authored Aug 13, 2016 by Linus Torvalds

Merge tag 'fixes-for-linus-4.8' of...

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

parents 120c5475 2b05980d

arch/h8300/include/asm/io.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,8 @@

		#ifdef __KERNEL__

		#include <linux/types.h>

		/* H8/300 internal I/O functions */

		#define __raw_readb __raw_readb

arch/unicore32/include/asm/mmu_context.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;