diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-03 12:58:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-03 12:58:31 -0700 |
| commit | cda689f8708b6bef0b921c3a17fcdecbe959a079 (patch) | |
| tree | 63d6c33f72a6672a6fcf93ab3c59a6b94e7da6a0 /arch/csky/mm | |
| parent | d835ff6c96ae6fa1ea474b0290a46e514ab6742b (diff) | |
| parent | e58a41c2226847fb1446f3942dc1b55af8acfe02 (diff) | |
Merge tag 'csky-for-linus-5.13-rc1' of git://github.com/c-sky/csky-linux
Pull arch/csky updates from Guo Ren:
"Just cleanups"
* tag 'csky-for-linus-5.13-rc1' of git://github.com/c-sky/csky-linux:
csky: uaccess.h: Coding convention with asm generic
csky: fix syscache.c fallthrough warning
csky: Fixup typos
csky: Remove duplicate include in arch/csky/kernel/entry.S
Diffstat (limited to 'arch/csky/mm')
| -rw-r--r-- | arch/csky/mm/fault.c | 2 | ||||
| -rw-r--r-- | arch/csky/mm/syscache.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/csky/mm/fault.c b/arch/csky/mm/fault.c index 1482de56f4f7..466ad949818a 100644 --- a/arch/csky/mm/fault.c +++ b/arch/csky/mm/fault.c @@ -12,7 +12,7 @@ int fixup_exception(struct pt_regs *regs) fixup = search_exception_tables(instruction_pointer(regs)); if (fixup) { - regs->pc = fixup->nextinsn; + regs->pc = fixup->fixup; return 1; } diff --git a/arch/csky/mm/syscache.c b/arch/csky/mm/syscache.c index ffade2f9a4c8..4e51d63850c4 100644 --- a/arch/csky/mm/syscache.c +++ b/arch/csky/mm/syscache.c @@ -17,6 +17,7 @@ SYSCALL_DEFINE3(cacheflush, flush_icache_mm_range(current->mm, (unsigned long)addr, (unsigned long)addr + bytes); + fallthrough; case DCACHE: dcache_wb_range((unsigned long)addr, (unsigned long)addr + bytes); |