diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-23 16:23:09 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-23 16:23:09 +0200 |
| commit | eb63b34bdfbdd70a734c2a90d89117c5c6c605c2 (patch) | |
| tree | e9d07ea9a6f3cae78be55e1400a2b7a08a5954e4 /arch | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| parent | FIRMWARE: bcm47xx_nvram: Fix module license. (diff) | |
| download | linux-eb63b34bdfbdd70a734c2a90d89117c5c6c605c2.tar.xz linux-eb63b34bdfbdd70a734c2a90d89117c5c6c605c2.zip | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS bug fixes from Ralf Baechle:
"Two more fixes for 4.2.
One fixes a build issue with the LLVM assembler - LLVM assembler macro
names are case sensitive, GNU as macro names are insensitive; the
other corrects a license string (GPL v2, not GPLv2) such that the
module loader will recognice the license correctly"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
FIRMWARE: bcm47xx_nvram: Fix module license.
MIPS: Fix LLVM build issue.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/kernel/genex.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S index af42e7003f12..baa7b6fc0a60 100644 --- a/arch/mips/kernel/genex.S +++ b/arch/mips/kernel/genex.S @@ -407,7 +407,7 @@ NESTED(nmi_handler, PT_SIZE, sp) .set noat SAVE_ALL FEXPORT(handle_\exception\ext) - __BUILD_clear_\clear + __build_clear_\clear .set at __BUILD_\verbose \exception move a0, sp |