diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-03 18:50:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-03 18:50:52 -0700 |
| commit | d8778f13b73f1cde08be0ece18571dee495b92f1 (patch) | |
| tree | fc34c795414f40b6e47e0e2ff300aed5b3a3a523 /arch | |
| parent | Merge branch 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux (diff) | |
| parent | xtensa: fix build for cores with coprocessors (diff) | |
| download | linux-dev-d8778f13b73f1cde08be0ece18571dee495b92f1.tar.xz linux-dev-d8778f13b73f1cde08be0ece18571dee495b92f1.zip | |
Merge tag 'xtensa-20190803' of git://github.com/jcmvbkbc/linux-xtensa
Pull Xtensa fix from Max Filippov:
"Fix build for xtensa cores with coprocessors that was broken by
entry/return abstraction patch"
* tag 'xtensa-20190803' of git://github.com/jcmvbkbc/linux-xtensa:
xtensa: fix build for cores with coprocessors
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/xtensa/kernel/coprocessor.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/xtensa/kernel/coprocessor.S b/arch/xtensa/kernel/coprocessor.S index 60c220020054..80828b95a51f 100644 --- a/arch/xtensa/kernel/coprocessor.S +++ b/arch/xtensa/kernel/coprocessor.S @@ -14,6 +14,7 @@ #include <linux/linkage.h> #include <asm/asm-offsets.h> +#include <asm/asmmacro.h> #include <asm/processor.h> #include <asm/coprocessor.h> #include <asm/thread_info.h> |