diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-01 13:40:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-01 13:40:30 -0700 |
| commit | 65beea4c3a526320b019ca5c010da41533dafaf5 (patch) | |
| tree | 7a07dde6553ac46cb4bd446003a813c365438f96 /arch/arc/lib/memset-archs.S | |
| parent | fb0af61d3afe0b8f8b7bd2ed7c9fcaae670ced4a (diff) | |
| parent | 55c0c4c793b538fb438bcc72481b9dc2f79fe5a9 (diff) | |
Merge tag 'arc-5.1-final' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta:
"A few minor fixes for ARC.
- regression in memset if line size !64
- avoid panic if PAE and IOC"
* tag 'arc-5.1-final' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: memset: fix build with L1_CACHE_SHIFT != 6
ARC: [hsdk] Make it easier to add PAE40 region to DTB
ARC: PAE40: don't panic and instead turn off hw ioc
Diffstat (limited to 'arch/arc/lib/memset-archs.S')
| -rw-r--r-- | arch/arc/lib/memset-archs.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arc/lib/memset-archs.S b/arch/arc/lib/memset-archs.S index f230bb7092fd..b3373f5c88e0 100644 --- a/arch/arc/lib/memset-archs.S +++ b/arch/arc/lib/memset-archs.S @@ -30,10 +30,10 @@ #else -.macro PREALLOC_INSTR +.macro PREALLOC_INSTR reg, off .endm -.macro PREFETCHW_INSTR +.macro PREFETCHW_INSTR reg, off .endm #endif |