mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-12-27 10:01:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'csky-for-linus-6.19' of https://github.com/c-sky/csky-linux

Browse Source 
Pull csky updates from Guo Ren:

 - Remove compile warning for CONFIG_SMP

 - Fix __ASSEMBLER__ typo in headers

 - Fix csky_cmpxchg_fixup

* tag 'csky-for-linus-6.19' of https://github.com/c-sky/csky-linux:
  csky: Remove compile warning for CONFIG_SMP
  csky: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi header
  csky: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
  csky: fix csky_cmpxchg_fixup not working
This commit is contained in:
Linus Torvalds
2025-12-10 12:17:29 +09:00
parent c9b47175e9 817d21578d
commit 565848bb3b
13 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/csky/abiv1/inc/abi/regdef.h
View File

@@ -3,7 +3,7 @@
#ifndef __ASM_CSKY_REGDEF_H #ifndef __ASM_CSKY_REGDEF_H
#define __ASM_CSKY_REGDEF_H #define __ASM_CSKY_REGDEF_H
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLER__
#define syscallid r1 #define syscallid r1
#else #else
#define syscallid "r1" #define syscallid "r1"

2
arch/csky/abiv2/inc/abi/regdef.h
View File

@@ -3,7 +3,7 @@
#ifndef __ASM_CSKY_REGDEF_H #ifndef __ASM_CSKY_REGDEF_H
#define __ASM_CSKY_REGDEF_H #define __ASM_CSKY_REGDEF_H
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLER__
#define syscallid r7 #define syscallid r7
#else #else
#define syscallid "r7" #define syscallid "r7"

4
arch/csky/include/asm/barrier.h
View File

@@ -3,7 +3,7 @@
#ifndef __ASM_CSKY_BARRIER_H #ifndef __ASM_CSKY_BARRIER_H
#define __ASM_CSKY_BARRIER_H #define __ASM_CSKY_BARRIER_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#define nop() asm volatile ("nop\n":::"memory") #define nop() asm volatile ("nop\n":::"memory")
@@ -84,5 +84,5 @@
#include <asm-generic/barrier.h> #include <asm-generic/barrier.h>
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* __ASM_CSKY_BARRIER_H */ #endif /* __ASM_CSKY_BARRIER_H */

2
arch/csky/include/asm/cache.h
View File

@@ -10,7 +10,7 @@
#define ARCH_DMA_MINALIGN L1_CACHE_BYTES #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
void dcache_wb_line(unsigned long start); void dcache_wb_line(unsigned long start);

4
arch/csky/include/asm/ftrace.h
View File

@@ -11,7 +11,7 @@
#define MCOUNT_ADDR ((unsigned long)_mcount) #define MCOUNT_ADDR ((unsigned long)_mcount)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
extern void _mcount(unsigned long); extern void _mcount(unsigned long);
@@ -28,5 +28,5 @@ struct dyn_arch_ftrace {
void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr, void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr,
unsigned long frame_pointer); unsigned long frame_pointer);
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLER__ */
#endif /* __ASM_CSKY_FTRACE_H */ #endif /* __ASM_CSKY_FTRACE_H */

4
arch/csky/include/asm/jump_label.h
View File

@@ -3,7 +3,7 @@
#ifndef __ASM_CSKY_JUMP_LABEL_H #ifndef __ASM_CSKY_JUMP_LABEL_H
#define __ASM_CSKY_JUMP_LABEL_H #define __ASM_CSKY_JUMP_LABEL_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <linux/types.h> #include <linux/types.h>
@@ -48,5 +48,5 @@ void arch_jump_label_transform_static(struct jump_entry *entry,
enum jump_label_type type); enum jump_label_type type);
#define arch_jump_label_transform_static arch_jump_label_transform_static #define arch_jump_label_transform_static arch_jump_label_transform_static
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* __ASM_CSKY_JUMP_LABEL_H */ #endif /* __ASM_CSKY_JUMP_LABEL_H */

4
arch/csky/include/asm/page.h
View File

@@ -26,7 +26,7 @@
#define PHYS_OFFSET_OFFSET (CONFIG_DRAM_BASE & (SSEG_SIZE - 1)) #define PHYS_OFFSET_OFFSET (CONFIG_DRAM_BASE & (SSEG_SIZE - 1))
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <linux/pfn.h> #include <linux/pfn.h>
@@ -84,5 +84,5 @@ static inline unsigned long virt_to_pfn(const void *kaddr)
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/getorder.h> #include <asm-generic/getorder.h>
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLER__ */
#endif /* __ASM_CSKY_PAGE_H */ #endif /* __ASM_CSKY_PAGE_H */

4
arch/csky/include/asm/ptrace.h
View File

@@ -8,7 +8,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#define PS_S 0x80000000 /* Supervisor Mode */ #define PS_S 0x80000000 /* Supervisor Mode */
@@ -98,5 +98,5 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
asmlinkage int syscall_trace_enter(struct pt_regs *regs); asmlinkage int syscall_trace_enter(struct pt_regs *regs);
asmlinkage void syscall_trace_exit(struct pt_regs *regs); asmlinkage void syscall_trace_exit(struct pt_regs *regs);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* __ASM_CSKY_PTRACE_H */ #endif /* __ASM_CSKY_PTRACE_H */

1
arch/csky/include/asm/sections.h
View File

@@ -8,5 +8,6 @@
extern char _start[]; extern char _start[];
asmlinkage void csky_start(unsigned int unused, void *dtb_start); asmlinkage void csky_start(unsigned int unused, void *dtb_start);
asmlinkage void csky_start_secondary(void);
#endif /* __ASM_SECTIONS_H */ #endif /* __ASM_SECTIONS_H */

2
arch/csky/include/asm/string.h
View File

@@ -3,7 +3,7 @@
#ifndef _CSKY_STRING_MM_H_ #ifndef _CSKY_STRING_MM_H_
#define _CSKY_STRING_MM_H_ #define _CSKY_STRING_MM_H_
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <linux/types.h> #include <linux/types.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <abi/string.h> #include <abi/string.h>

4
arch/csky/include/asm/thread_info.h
View File

@@ -3,7 +3,7 @@
#ifndef _ASM_CSKY_THREAD_INFO_H #ifndef _ASM_CSKY_THREAD_INFO_H
#define _ASM_CSKY_THREAD_INFO_H #define _ASM_CSKY_THREAD_INFO_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <asm/types.h> #include <asm/types.h>
#include <asm/page.h> #include <asm/page.h>
@@ -51,7 +51,7 @@ static inline struct thread_info *current_thread_info(void)
return (struct thread_info *)(sp & ~(THREAD_SIZE - 1)); return (struct thread_info *)(sp & ~(THREAD_SIZE - 1));
} }
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLER__ */
#define TIF_SIGPENDING 0 /* signal pending */ #define TIF_SIGPENDING 0 /* signal pending */
#define TIF_NOTIFY_RESUME 1 /* callback before returning to user */ #define TIF_NOTIFY_RESUME 1 /* callback before returning to user */

4
arch/csky/include/uapi/asm/ptrace.h
View File

@@ -3,7 +3,7 @@
#ifndef _CSKY_PTRACE_H #ifndef _CSKY_PTRACE_H
#define _CSKY_PTRACE_H #define _CSKY_PTRACE_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
struct pt_regs { struct pt_regs {
unsigned long tls; unsigned long tls;
@@ -47,5 +47,5 @@ struct user_fp {
unsigned long reserved; unsigned long reserved;
}; };
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* _CSKY_PTRACE_H */ #endif /* _CSKY_PTRACE_H */

4
arch/csky/mm/fault.c
View File

@@ -45,8 +45,8 @@ static inline void csky_cmpxchg_fixup(struct pt_regs *regs)
if (trap_no(regs) != VEC_TLBMODIFIED) if (trap_no(regs) != VEC_TLBMODIFIED)
return; return;
if (instruction_pointer(regs) == csky_cmpxchg_stw) if (instruction_pointer(regs) == (unsigned long)&csky_cmpxchg_stw)
instruction_pointer_set(regs, csky_cmpxchg_ldw); instruction_pointer_set(regs, (unsigned long)&csky_cmpxchg_ldw);
return; return;
} }
#endif #endif