diff options
| author | Linus Torvalds | 2015-06-11 02:16:32 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2015-06-11 02:16:32 +0200 |
| commit | 2bfc60dd2869745f5bbed9583c517cc76e3db924 (patch) | |
| tree | 026fb79e04649790e0481d194ed774c5d5efc3d2 | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| parent | score: Fix exception handler label (diff) | |
| download | kernel-qcow2-linux-2bfc60dd2869745f5bbed9583c517cc76e3db924.tar.gz kernel-qcow2-linux-2bfc60dd2869745f5bbed9583c517cc76e3db924.tar.xz kernel-qcow2-linux-2bfc60dd2869745f5bbed9583c517cc76e3db924.zip | |
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
| -rw-r--r-- | arch/blackfin/include/asm/io.h | 1 | ||||
| -rw-r--r-- | arch/score/lib/string.S | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/blackfin/include/asm/io.h b/arch/blackfin/include/asm/io.h index 4e8ad0523118..6abebe82d4e9 100644 --- a/arch/blackfin/include/asm/io.h +++ b/arch/blackfin/include/asm/io.h @@ -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 diff --git a/arch/score/lib/string.S b/arch/score/lib/string.S index 00b7d3a2fc60..16efa3ad037f 100644 --- a/arch/score/lib/string.S +++ b/arch/score/lib/string.S @@ -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 |