diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-17 15:32:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-17 15:32:30 -0400 |
| commit | 96d928ed75c4ba4253e82910a697ec7b06ace8b4 (patch) | |
| tree | 85efd913b001721f953513873c6627e35d91b71e /arch/xtensa/kernel | |
| parent | e076b7c1343e0810880e6b909445f06921f31067 (diff) | |
| parent | 2ba9268dd603d23e17643437b2246acb6844953b (diff) | |
Merge tag 'xtensa-20150416' of git://github.com/czankel/xtensa-linux
Pull Xtensa updates from Chris Zankel:
- fix linker script transformation for .text / .text.fixup
- wire bpf and execveat syscalls
- provide __NR_sync_file_range2 instead of __NR_sync_file_range, as
that's what xtensa uses.
- make xtfpgs LCD driver functional and configurable. This fixes
hardware lockup on KC705/ML605 boot
- add audio subsystem bits to xtfpga DTS and provide sample KC705
config with audio features enabled
- add CY7C67300 USB controller support to XTFPGA
- fix locking issues in ISS network driver
- document PIC and MX interrupt distributor device tree bindings
* tag 'xtensa-20150416' of git://github.com/czankel/xtensa-linux:
xtensa: xtfpga: add CY7C67300 USB controller support
irqchip: xtensa-pic: xtensa-mx: document DT bindings
xtensa: ISS: fix locking in TAP network adapter
xtensa: Fix fix linker script transformation for .text / .text.fixup
xtensa: provide __NR_sync_file_range2 instead of __NR_sync_file_range
xtensa: wire bpf and execveat syscalls
xtensa: xtfpga: fix hardware lockup caused by LCD driver
xtensa: xtfpga: provide defconfig with audio subsystem
xtensa: xtfpga: add audio card to xtfpga DTS
Diffstat (limited to 'arch/xtensa/kernel')
| -rw-r--r-- | arch/xtensa/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/xtensa/kernel/Makefile b/arch/xtensa/kernel/Makefile index 18d962a8c0c2..d3a0f0fd56dd 100644 --- a/arch/xtensa/kernel/Makefile +++ b/arch/xtensa/kernel/Makefile | |||
| @@ -29,6 +29,7 @@ AFLAGS_head.o += -mtext-section-literals | |||
| 29 | 29 | ||
| 30 | sed-y = -e 's/\*(\(\.[a-z]*it\|\.ref\|\)\.text)/*(\1.literal \1.text)/g' \ | 30 | sed-y = -e 's/\*(\(\.[a-z]*it\|\.ref\|\)\.text)/*(\1.literal \1.text)/g' \ |
| 31 | -e 's/\.text\.unlikely/.literal.unlikely .text.unlikely/g' \ | 31 | -e 's/\.text\.unlikely/.literal.unlikely .text.unlikely/g' \ |
| 32 | -e 's/\*(\(\.text .*\))/*(.literal \1)/g' \ | ||
| 32 | -e 's/\*(\(\.text\.[a-z]*\))/*(\1.literal \1)/g' | 33 | -e 's/\*(\(\.text\.[a-z]*\))/*(\1.literal \1)/g' |
| 33 | 34 | ||
| 34 | quiet_cmd__cpp_lds_S = LDS $@ | 35 | quiet_cmd__cpp_lds_S = LDS $@ |