Merge tag 'xtensa-20190803' of git://github.com/jcmvbkbc/linux-xtensa

d8778f13 · Linus Torvalds <[email protected]> · 2019-08-03 18:50:52 -07:00

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

Commit: d8778f13b73f1cde08be0ece18571dee495b92f1
Parents: cf6c8aef · e3cacb73

Merge commit. Changes below are compared with the first parent: cf6c8aef.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
arch/xtensa/kernel/coprocessor.S	modified	+1	−0	View file

arch/xtensa/kernel/coprocessor.S

View file

diff --git a/arch/xtensa/kernel/coprocessor.S b/arch/xtensa/kernel/coprocessor.S
index 60c2200..80828b9 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>