Commit 2bfc60dd authored Jun 10, 2015 by Linus Torvalds

Merge tag 'misc-for-linus-4.1-rc8' of...

Merge tag 'misc-for-linus-4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull misc fixes from Guenter Roeck:
 "There are two patches here.  One fixes a build error affecting the
  blackfin architecture, the other fixes a build error affecting the
  score architecture.

  The score maintainer (Lennox Wu) has a hard time sending you the score
  patch, and the blackfin maintainer (Steven Miao) has been silent since
  -rc1.  Since 4.1 is about to be released, I figured it would be useful
  to get the patches upstream to avoid the related build failures in the
  final release"

* tag 'misc-for-linus-4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  score: Fix exception handler label
  blackfin: Fix build error

parents f5278565 80524e93

arch/blackfin/include/asm/io.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@
		#include <linux/compiler.h>
		#include <linux/types.h>
		#include <asm/byteorder.h>
		#include <asm/def_LPBlackfin.h>

		#define __raw_readb bfin_read8
		#define __raw_readw bfin_read16

arch/score/lib/string.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -175,10 +175,10 @@ ENTRY(__clear_user)
		br r3

		.section .fixup, "ax"
		99:
		br r3
		.previous
		.section __ex_table, "a"
		.align 2
		99:
		.word 0b, 99b
		.previous