tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

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

Linus Torvalds 565848bb c9b47175

+21 -20
+1 -1
arch/csky/abiv1/inc/abi/regdef.h
··· 3 3 #ifndef __ASM_CSKY_REGDEF_H 4 4 #define __ASM_CSKY_REGDEF_H 5 5 6 - #ifdef __ASSEMBLY__ 6 + #ifdef __ASSEMBLER__ 7 7 #define syscallid r1 8 8 #else 9 9 #define syscallid "r1"
+1 -1
arch/csky/abiv2/inc/abi/regdef.h
··· 3 3 #ifndef __ASM_CSKY_REGDEF_H 4 4 #define __ASM_CSKY_REGDEF_H 5 5 6 - #ifdef __ASSEMBLY__ 6 + #ifdef __ASSEMBLER__ 7 7 #define syscallid r7 8 8 #else 9 9 #define syscallid "r7"
+2 -2
arch/csky/include/asm/barrier.h
··· 3 3 #ifndef __ASM_CSKY_BARRIER_H 4 4 #define __ASM_CSKY_BARRIER_H 5 5 6 - #ifndef __ASSEMBLY__ 6 + #ifndef __ASSEMBLER__ 7 7 8 8 #define nop() asm volatile ("nop\n":::"memory") 9 9 ··· 84 84 85 85 #include <asm-generic/barrier.h> 86 86 87 - #endif /* __ASSEMBLY__ */ 87 + #endif /* __ASSEMBLER__ */ 88 88 #endif /* __ASM_CSKY_BARRIER_H */
+1 -1
arch/csky/include/asm/cache.h
··· 10 10 11 11 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES 12 12 13 - #ifndef __ASSEMBLY__ 13 + #ifndef __ASSEMBLER__ 14 14 15 15 void dcache_wb_line(unsigned long start); 16 16
+2 -2
arch/csky/include/asm/ftrace.h
··· 11 11 12 12 #define MCOUNT_ADDR ((unsigned long)_mcount) 13 13 14 - #ifndef __ASSEMBLY__ 14 + #ifndef __ASSEMBLER__ 15 15 16 16 extern void _mcount(unsigned long); 17 17 ··· 28 28 void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr, 29 29 unsigned long frame_pointer); 30 30 31 - #endif /* !__ASSEMBLY__ */ 31 + #endif /* !__ASSEMBLER__ */ 32 32 #endif /* __ASM_CSKY_FTRACE_H */
+2 -2
arch/csky/include/asm/jump_label.h
··· 3 3 #ifndef __ASM_CSKY_JUMP_LABEL_H 4 4 #define __ASM_CSKY_JUMP_LABEL_H 5 5 6 - #ifndef __ASSEMBLY__ 6 + #ifndef __ASSEMBLER__ 7 7 8 8 #include <linux/types.h> 9 9 ··· 48 48 enum jump_label_type type); 49 49 #define arch_jump_label_transform_static arch_jump_label_transform_static 50 50 51 - #endif /* __ASSEMBLY__ */ 51 + #endif /* __ASSEMBLER__ */ 52 52 #endif /* __ASM_CSKY_JUMP_LABEL_H */
+2 -2
arch/csky/include/asm/page.h
··· 26 26 27 27 #define PHYS_OFFSET_OFFSET (CONFIG_DRAM_BASE & (SSEG_SIZE - 1)) 28 28 29 - #ifndef __ASSEMBLY__ 29 + #ifndef __ASSEMBLER__ 30 30 31 31 #include <linux/pfn.h> 32 32 ··· 84 84 #include <asm-generic/memory_model.h> 85 85 #include <asm-generic/getorder.h> 86 86 87 - #endif /* !__ASSEMBLY__ */ 87 + #endif /* !__ASSEMBLER__ */ 88 88 #endif /* __ASM_CSKY_PAGE_H */
+2 -2
arch/csky/include/asm/ptrace.h
··· 8 8 #include <linux/types.h> 9 9 #include <linux/compiler.h> 10 10 11 - #ifndef __ASSEMBLY__ 11 + #ifndef __ASSEMBLER__ 12 12 13 13 #define PS_S 0x80000000 /* Supervisor Mode */ 14 14 ··· 98 98 99 99 asmlinkage int syscall_trace_enter(struct pt_regs *regs); 100 100 asmlinkage void syscall_trace_exit(struct pt_regs *regs); 101 - #endif /* __ASSEMBLY__ */ 101 + #endif /* __ASSEMBLER__ */ 102 102 #endif /* __ASM_CSKY_PTRACE_H */
+1
arch/csky/include/asm/sections.h
··· 8 8 extern char _start[]; 9 9 10 10 asmlinkage void csky_start(unsigned int unused, void *dtb_start); 11 + asmlinkage void csky_start_secondary(void); 11 12 12 13 #endif /* __ASM_SECTIONS_H */
+1 -1
arch/csky/include/asm/string.h
··· 3 3 #ifndef _CSKY_STRING_MM_H_ 4 4 #define _CSKY_STRING_MM_H_ 5 5 6 - #ifndef __ASSEMBLY__ 6 + #ifndef __ASSEMBLER__ 7 7 #include <linux/types.h> 8 8 #include <linux/compiler.h> 9 9 #include <abi/string.h>
+2 -2
arch/csky/include/asm/thread_info.h
··· 3 3 #ifndef _ASM_CSKY_THREAD_INFO_H 4 4 #define _ASM_CSKY_THREAD_INFO_H 5 5 6 - #ifndef __ASSEMBLY__ 6 + #ifndef __ASSEMBLER__ 7 7 8 8 #include <asm/types.h> 9 9 #include <asm/page.h> ··· 51 51 return (struct thread_info *)(sp & ~(THREAD_SIZE - 1)); 52 52 } 53 53 54 - #endif /* !__ASSEMBLY__ */ 54 + #endif /* !__ASSEMBLER__ */ 55 55 56 56 #define TIF_SIGPENDING 0 /* signal pending */ 57 57 #define TIF_NOTIFY_RESUME 1 /* callback before returning to user */
+2 -2
arch/csky/include/uapi/asm/ptrace.h
··· 3 3 #ifndef _CSKY_PTRACE_H 4 4 #define _CSKY_PTRACE_H 5 5 6 - #ifndef __ASSEMBLY__ 6 + #ifndef __ASSEMBLER__ 7 7 8 8 struct pt_regs { 9 9 unsigned long tls; ··· 47 47 unsigned long reserved; 48 48 }; 49 49 50 - #endif /* __ASSEMBLY__ */ 50 + #endif /* __ASSEMBLER__ */ 51 51 #endif /* _CSKY_PTRACE_H */
+2 -2
arch/csky/mm/fault.c
··· 45 45 if (trap_no(regs) != VEC_TLBMODIFIED) 46 46 return; 47 47 48 - if (instruction_pointer(regs) == csky_cmpxchg_stw) 49 - instruction_pointer_set(regs, csky_cmpxchg_ldw); 48 + if (instruction_pointer(regs) == (unsigned long)&csky_cmpxchg_stw) 49 + instruction_pointer_set(regs, (unsigned long)&csky_cmpxchg_ldw); 50 50 return; 51 51 } 52 52 #endif