Skip to content

Commit cda689f

Browse files
committed
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
2 parents d835ff6 + e58a41c commit cda689f

File tree

10 files changed

+349
-483
lines changed

10 files changed

+349
-483
lines changed

arch/csky/include/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
22
generic-y += asm-offsets.h
3+
generic-y += extable.h
34
generic-y += gpio.h
45
generic-y += kvm_para.h
56
generic-y += qrwlock.h

arch/csky/include/asm/asid.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void asid_new_context(struct asid_info *info, atomic64_t *pasid,
3737
* Check the ASID is still valid for the context. If not generate a new ASID.
3838
*
3939
* @pasid: Pointer to the current ASID batch
40-
* @cpu: current CPU ID. Must have been acquired throught get_cpu()
40+
* @cpu: current CPU ID. Must have been acquired through get_cpu()
4141
*/
4242
static inline void asid_check_context(struct asid_info *info,
4343
atomic64_t *pasid, unsigned int cpu,

arch/csky/include/asm/barrier.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464

6565
/*
6666
* sync: completion barrier, all sync.xx instructions
67-
* guarantee the last response recieved by bus transaction
67+
* guarantee the last response received by bus transaction
6868
* made by ld/st instructions before sync.s
6969
* sync.s: inherit from sync, but also shareable to other cores
7070
* sync.i: inherit from sync, but also flush cpu pipeline

arch/csky/include/asm/segment.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,4 @@ typedef struct {
77
unsigned long seg;
88
} mm_segment_t;
99

10-
#define KERNEL_DS ((mm_segment_t) { 0xFFFFFFFF })
11-
12-
#define USER_DS ((mm_segment_t) { PAGE_OFFSET })
13-
#define get_fs() (current_thread_info()->addr_limit)
14-
#define set_fs(x) (current_thread_info()->addr_limit = (x))
15-
#define uaccess_kernel() (get_fs().seg == KERNEL_DS.seg)
16-
1710
#endif /* __ASM_CSKY_SEGMENT_H */

0 commit comments

Comments
 (0)