renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-26 11:34:42 +08:00
Code

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Browse Source 
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.
This commit is contained in:
Linus Torvalds 2015-08-23 07:23:09 -07:00
commit eb63b34bdf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/kernel/genex.S
View File

@ -407,7 +407,7 @@ NESTED(nmi_handler, PT_SIZE, sp)
.set noat .set noat
SAVE_ALL SAVE_ALL
FEXPORT(handle_\exception\ext) FEXPORT(handle_\exception\ext)
__BUILD_clear_\clear __build_clear_\clear
.set at .set at
__BUILD_\verbose \exception __BUILD_\verbose \exception
move a0, sp move a0, sp

2
drivers/firmware/broadcom/bcm47xx_nvram.c
View File

@ -245,4 +245,4 @@ char *bcm47xx_nvram_get_contents(size_t *nvram_size)
} }
EXPORT_SYMBOL(bcm47xx_nvram_get_contents); EXPORT_SYMBOL(bcm47xx_nvram_get_contents);
MODULE_LICENSE("GPLv2"); MODULE_LICENSE("GPL v2");