Skip to content

Commit

Permalink
Merge tag 'csky-for-linus-5.13-rc1' of git://github.com/c-sky/csky-linux
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Linus Torvalds committed May 3, 2021
2 parents d835ff6 + e58a41c commit cda689f
Showing 10 changed files with 349 additions and 483 deletions.
1 change: 1 addition & 0 deletions arch/csky/include/asm/Kbuild
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
generic-y += asm-offsets.h
generic-y += extable.h
generic-y += gpio.h
generic-y += kvm_para.h
generic-y += qrwlock.h
2 changes: 1 addition & 1 deletion arch/csky/include/asm/asid.h
Original file line number Diff line number Diff line change
@@ -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,
2 changes: 1 addition & 1 deletion arch/csky/include/asm/barrier.h
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@

/*
* sync: completion barrier, all sync.xx instructions
* guarantee the last response recieved by bus transaction
* guarantee the last response received by bus transaction
* made by ld/st instructions before sync.s
* sync.s: inherit from sync, but also shareable to other cores
* sync.i: inherit from sync, but also flush cpu pipeline
7 changes: 0 additions & 7 deletions arch/csky/include/asm/segment.h
Original file line number Diff line number Diff line change
@@ -7,11 +7,4 @@ typedef struct {
unsigned long seg;
} mm_segment_t;

#define KERNEL_DS ((mm_segment_t) { 0xFFFFFFFF })

#define USER_DS ((mm_segment_t) { PAGE_OFFSET })
#define get_fs() (current_thread_info()->addr_limit)
#define set_fs(x) (current_thread_info()->addr_limit = (x))
#define uaccess_kernel() (get_fs().seg == KERNEL_DS.seg)

#endif /* __ASM_CSKY_SEGMENT_H */
Loading

0 comments on commit cda689f

Please sign in to comment.