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/include/asm/asid.h | |
| 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/include/asm/asid.h')
| -rw-r--r-- | arch/csky/include/asm/asid.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/csky/include/asm/asid.h b/arch/csky/include/asm/asid.h index ac08b0ffbe1f..6ff205a97a14 100644 --- a/arch/csky/include/asm/asid.h +++ b/arch/csky/include/asm/asid.h @@ -37,7 +37,7 @@ void asid_new_context(struct asid_info *info, atomic64_t *pasid, * Check the ASID is still valid for the context. If not generate a new ASID. * * @pasid: Pointer to the current ASID batch - * @cpu: current CPU ID. Must have been acquired throught get_cpu() + * @cpu: current CPU ID. Must have been acquired through get_cpu() */ static inline void asid_check_context(struct asid_info *info, atomic64_t *pasid, unsigned int cpu, |