diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-11 17:27:34 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-11 17:27:34 +0300 |
| commit | 7a5575212ce4b6a41581b92fe03b6be1134793ba (patch) | |
| tree | f76ae29af196387330dd9a7c4a86200cbe80182c /arch/xtensa/lib/memset.S | |
| parent | 1fb3b526df3bd7647e7854915ae6b22299408baf (diff) | |
| parent | a5944195d00a359e28d6e093593609bcee37ed5e (diff) | |
| download | linux-7a5575212ce4b6a41581b92fe03b6be1134793ba.tar.xz | |
Merge tag 'xtensa-20190510' of git://github.com/jcmvbkbc/linux-xtensa
Pull xtensa updates from Max Filippov:
- implement atomic operations using exclusive access Xtensa option
operations
- add support for Xtensa cores with memory protection unit (MPU)
- clean up xtensa-specific kernel-only headers
- fix error path in simdisk_setup
* tag 'xtensa-20190510' of git://github.com/jcmvbkbc/linux-xtensa:
xtensa: implement initialize_cacheattr for MPU cores
xtensa: add exclusive atomics support
xtensa: clean up inline assembly in futex.h
xtensa: replace variant/core.h with asm/core.h
xtensa: drop ifdef __KERNEL__ from kernel-only headers
xtensa: set proper error code for simdisk_setup()
xtensa: fix incorrect fd close in error case of simdisk_setup()
Diffstat (limited to 'arch/xtensa/lib/memset.S')
| -rw-r--r-- | arch/xtensa/lib/memset.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/lib/memset.S b/arch/xtensa/lib/memset.S index 276747dec300..8632eacbdc80 100644 --- a/arch/xtensa/lib/memset.S +++ b/arch/xtensa/lib/memset.S @@ -12,8 +12,8 @@ */ #include <linux/linkage.h> -#include <variant/core.h> #include <asm/asmmacro.h> +#include <asm/core.h> /* * void *memset(void *dst, int c, size_t length) |