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

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'sh-for-v6.16-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux

Pull sh updates from John Paul Adrian Glaubitz:

- replace the __ASSEMBLY__ with __ASSEMBLER__ macro in all headers
since the latter is now defined automatically by both GCC and Clang
when compiling assembly code (Thomas Huth)

- set the default SPI mode for the ecovec24 board which became
necessary after a new mode member as added to the sh_msiof_spi_info
struct in cf9e4784f3bd ("spi: sh-msiof: Add slave mode support")
(Geert Uytterhoeven)

- remove unused variables in the kprobes code in
kprobe_exceptions_notify() (Mike Rapoport)

* tag 'sh-for-v6.16-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux:
sh: kprobes: Remove unused variables in kprobe_exceptions_notify()
sh: ecovec24: Make SPI mode explicit
sh: Replace __ASSEMBLY__ with __ASSEMBLER__ in all headers

Linus Torvalds b3154a6f b7191581

+47 -50
+1
arch/sh/boards/mach-ecovec24/setup.c
··· 825 825 /* MSIOF0 */ 826 826 static struct sh_msiof_spi_info msiof0_data = { 827 827 .num_chipselect = 1, 828 + .mode = MSIOF_SPI_HOST, 828 829 }; 829 830 830 831 static struct resource msiof0_resources[] = {
+2 -2
arch/sh/include/asm/cache.h
··· 22 22 23 23 #define __read_mostly __section(".data..read_mostly") 24 24 25 - #ifndef __ASSEMBLY__ 25 + #ifndef __ASSEMBLER__ 26 26 struct cache_info { 27 27 unsigned int ways; /* Number of cache ways */ 28 28 unsigned int sets; /* Number of cache sets */ ··· 48 48 49 49 unsigned long flags; 50 50 }; 51 - #endif /* __ASSEMBLY__ */ 51 + #endif /* __ASSEMBLER__ */ 52 52 #endif /* __ASM_SH_CACHE_H */
+3 -3
arch/sh/include/asm/dwarf.h
··· 189 189 */ 190 190 #define DWARF_ARCH_RA_REG 17 191 191 192 - #ifndef __ASSEMBLY__ 192 + #ifndef __ASSEMBLER__ 193 193 194 194 #include <linux/compiler.h> 195 195 #include <linux/bug.h> ··· 379 379 struct module *); 380 380 extern void module_dwarf_cleanup(struct module *); 381 381 382 - #endif /* !__ASSEMBLY__ */ 382 + #endif /* !__ASSEMBLER__ */ 383 383 384 384 #define CFI_STARTPROC .cfi_startproc 385 385 #define CFI_ENDPROC .cfi_endproc ··· 402 402 #define CFI_REL_OFFSET CFI_IGNORE 403 403 #define CFI_UNDEFINED CFI_IGNORE 404 404 405 - #ifndef __ASSEMBLY__ 405 + #ifndef __ASSEMBLER__ 406 406 static inline void dwarf_unwinder_init(void) 407 407 { 408 408 }
+2 -2
arch/sh/include/asm/fpu.h
··· 2 2 #ifndef __ASM_SH_FPU_H 3 3 #define __ASM_SH_FPU_H 4 4 5 - #ifndef __ASSEMBLY__ 5 + #ifndef __ASSEMBLER__ 6 6 7 7 #include <asm/ptrace.h> 8 8 ··· 67 67 void float_raise(unsigned int flags); 68 68 int float_rounding_mode(void); 69 69 70 - #endif /* __ASSEMBLY__ */ 70 + #endif /* __ASSEMBLER__ */ 71 71 72 72 #endif /* __ASM_SH_FPU_H */
+4 -4
arch/sh/include/asm/ftrace.h
··· 7 7 #define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */ 8 8 #define FTRACE_SYSCALL_MAX NR_syscalls 9 9 10 - #ifndef __ASSEMBLY__ 10 + #ifndef __ASSEMBLER__ 11 11 extern void mcount(void); 12 12 13 13 #define MCOUNT_ADDR ((unsigned long)(mcount)) ··· 35 35 36 36 void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr); 37 37 38 - #endif /* __ASSEMBLY__ */ 38 + #endif /* __ASSEMBLER__ */ 39 39 #endif /* CONFIG_FUNCTION_TRACER */ 40 40 41 - #ifndef __ASSEMBLY__ 41 + #ifndef __ASSEMBLER__ 42 42 43 43 /* arch/sh/kernel/return_address.c */ 44 44 extern void *return_address(unsigned int); ··· 53 53 static inline void arch_ftrace_nmi_exit(void) { } 54 54 #endif 55 55 56 - #endif /* __ASSEMBLY__ */ 56 + #endif /* __ASSEMBLER__ */ 57 57 58 58 #endif /* __ASM_SH_FTRACE_H */
+2 -2
arch/sh/include/asm/mmu.h
··· 33 33 34 34 #define PMB_NO_ENTRY (-1) 35 35 36 - #ifndef __ASSEMBLY__ 36 + #ifndef __ASSEMBLER__ 37 37 #include <linux/errno.h> 38 38 #include <linux/threads.h> 39 39 #include <asm/page.h> ··· 102 102 return pmb_remap_caller(phys, size, prot, __builtin_return_address(0)); 103 103 } 104 104 105 - #endif /* __ASSEMBLY__ */ 105 + #endif /* __ASSEMBLER__ */ 106 106 107 107 #endif /* __MMU_H */
+4 -4
arch/sh/include/asm/page.h
··· 30 30 #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT-PAGE_SHIFT) 31 31 #endif 32 32 33 - #ifndef __ASSEMBLY__ 33 + #ifndef __ASSEMBLER__ 34 34 #include <asm/uncached.h> 35 35 36 36 extern unsigned long shm_align_mask; ··· 85 85 86 86 #define pte_pgprot(x) __pgprot(pte_val(x) & PTE_FLAGS_MASK) 87 87 88 - #endif /* !__ASSEMBLY__ */ 88 + #endif /* !__ASSEMBLER__ */ 89 89 90 90 /* 91 91 * __MEMORY_START and SIZE are the physical addresses and size of RAM. ··· 126 126 #define ___va(x) ((x)+PAGE_OFFSET) 127 127 #endif 128 128 129 - #ifndef __ASSEMBLY__ 129 + #ifndef __ASSEMBLER__ 130 130 #define __pa(x) ___pa((unsigned long)x) 131 131 #define __va(x) (void *)___va((unsigned long)x) 132 - #endif /* !__ASSEMBLY__ */ 132 + #endif /* !__ASSEMBLER__ */ 133 133 134 134 #ifdef CONFIG_UNCACHED_MAPPING 135 135 #if defined(CONFIG_29BIT)
+2 -2
arch/sh/include/asm/pgtable.h
··· 17 17 #include <asm/page.h> 18 18 #include <asm/mmu.h> 19 19 20 - #ifndef __ASSEMBLY__ 20 + #ifndef __ASSEMBLER__ 21 21 #include <asm/addrspace.h> 22 22 #include <asm/fixmap.h> 23 23 ··· 28 28 extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; 29 29 #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page)) 30 30 31 - #endif /* !__ASSEMBLY__ */ 31 + #endif /* !__ASSEMBLER__ */ 32 32 33 33 /* 34 34 * Effective and physical address definitions, to aid with sign
+4 -4
arch/sh/include/asm/pgtable_32.h
··· 170 170 (PTE_MASK | _PAGE_ACCESSED | _PAGE_CACHABLE | \ 171 171 _PAGE_DIRTY | _PAGE_SPECIAL) 172 172 173 - #ifndef __ASSEMBLY__ 173 + #ifndef __ASSEMBLER__ 174 174 175 175 #if defined(CONFIG_X2TLB) /* SH-X2 TLB */ 176 176 #define PAGE_NONE __pgprot(_PAGE_PROTNONE | _PAGE_CACHABLE | \ ··· 287 287 __pgprot(0) 288 288 #endif 289 289 290 - #endif /* __ASSEMBLY__ */ 290 + #endif /* __ASSEMBLER__ */ 291 291 292 - #ifndef __ASSEMBLY__ 292 + #ifndef __ASSEMBLER__ 293 293 294 294 /* 295 295 * Certain architectures need to do special things when PTEs ··· 478 478 PTE_BIT_FUNC(low, swp_mkexclusive, |= _PAGE_SWP_EXCLUSIVE); 479 479 PTE_BIT_FUNC(low, swp_clear_exclusive, &= ~_PAGE_SWP_EXCLUSIVE); 480 480 481 - #endif /* __ASSEMBLY__ */ 481 + #endif /* __ASSEMBLER__ */ 482 482 #endif /* __ASM_SH_PGTABLE_32_H */
+2 -2
arch/sh/include/asm/processor.h
··· 5 5 #include <asm/cpu-features.h> 6 6 #include <asm/cache.h> 7 7 8 - #ifndef __ASSEMBLY__ 8 + #ifndef __ASSEMBLER__ 9 9 /* 10 10 * CPU type and hardware bug flags. Kept separately for each CPU. 11 11 * ··· 168 168 169 169 void select_idle_routine(void); 170 170 171 - #endif /* __ASSEMBLY__ */ 171 + #endif /* __ASSEMBLER__ */ 172 172 173 173 #include <asm/processor_32.h> 174 174
+2 -2
arch/sh/include/asm/smc37c93x.h
··· 67 67 #define UART_DLL 0x0 /* Divisor Latch (LS) */ 68 68 #define UART_DLM 0x2 /* Divisor Latch (MS) */ 69 69 70 - #ifndef __ASSEMBLY__ 70 + #ifndef __ASSEMBLER__ 71 71 typedef struct uart_reg { 72 72 volatile __u16 rbr; 73 73 volatile __u16 ier; ··· 78 78 volatile __u16 msr; 79 79 volatile __u16 scr; 80 80 } uart_reg; 81 - #endif /* ! __ASSEMBLY__ */ 81 + #endif /* ! __ASSEMBLER__ */ 82 82 83 83 /* Alias for Write Only Register */ 84 84
+1 -1
arch/sh/include/asm/suspend.h
··· 2 2 #ifndef _ASM_SH_SUSPEND_H 3 3 #define _ASM_SH_SUSPEND_H 4 4 5 - #ifndef __ASSEMBLY__ 5 + #ifndef __ASSEMBLER__ 6 6 #include <linux/notifier.h> 7 7 8 8 #include <asm/ptrace.h>
+5 -5
arch/sh/include/asm/thread_info.h
··· 21 21 #define FAULT_CODE_PROT (1 << 3) /* protection fault */ 22 22 #define FAULT_CODE_USER (1 << 4) /* user-mode access */ 23 23 24 - #ifndef __ASSEMBLY__ 24 + #ifndef __ASSEMBLER__ 25 25 #include <asm/processor.h> 26 26 27 27 struct thread_info { ··· 49 49 /* 50 50 * macros/functions for gaining access to the thread information structure 51 51 */ 52 - #ifndef __ASSEMBLY__ 52 + #ifndef __ASSEMBLER__ 53 53 #define INIT_THREAD_INFO(tsk) \ 54 54 { \ 55 55 .task = &tsk, \ ··· 86 86 87 87 extern void init_thread_xstate(void); 88 88 89 - #endif /* __ASSEMBLY__ */ 89 + #endif /* __ASSEMBLER__ */ 90 90 91 91 /* 92 92 * Thread information flags ··· 144 144 */ 145 145 #define TS_USEDFPU 0x0002 /* FPU used by this task this quantum */ 146 146 147 - #ifndef __ASSEMBLY__ 147 + #ifndef __ASSEMBLER__ 148 148 149 149 #define TI_FLAG_FAULT_CODE_SHIFT 24 150 150 ··· 164 164 return ti->flags >> TI_FLAG_FAULT_CODE_SHIFT; 165 165 } 166 166 167 - #endif /* !__ASSEMBLY__ */ 167 + #endif /* !__ASSEMBLER__ */ 168 168 #endif /* __ASM_SH_THREAD_INFO_H */
+2 -2
arch/sh/include/asm/tlb.h
··· 2 2 #ifndef __ASM_SH_TLB_H 3 3 #define __ASM_SH_TLB_H 4 4 5 - #ifndef __ASSEMBLY__ 5 + #ifndef __ASSEMBLER__ 6 6 #include <linux/pagemap.h> 7 7 #include <asm-generic/tlb.h> 8 8 ··· 29 29 unsigned long address); 30 30 31 31 #endif /* CONFIG_MMU */ 32 - #endif /* __ASSEMBLY__ */ 32 + #endif /* __ASSEMBLER__ */ 33 33 #endif /* __ASM_SH_TLB_H */
+2 -2
arch/sh/include/asm/types.h
··· 7 7 /* 8 8 * These aren't exported outside the kernel to avoid name space clashes 9 9 */ 10 - #ifndef __ASSEMBLY__ 10 + #ifndef __ASSEMBLER__ 11 11 12 12 typedef u16 insn_size_t; 13 13 typedef u32 reg_size_t; 14 14 15 - #endif /* __ASSEMBLY__ */ 15 + #endif /* __ASSEMBLER__ */ 16 16 #endif /* __ASM_SH_TYPES_H */
+3 -3
arch/sh/include/mach-common/mach/romimage.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 - #ifdef __ASSEMBLY__ 2 + #ifdef __ASSEMBLER__ 3 3 4 4 /* do nothing here by default */ 5 5 6 - #else /* __ASSEMBLY__ */ 6 + #else /* __ASSEMBLER__ */ 7 7 8 8 static inline void mmcif_update_progress(int nr) 9 9 { 10 10 } 11 11 12 - #endif /* __ASSEMBLY__ */ 12 + #endif /* __ASSEMBLER__ */
+3 -3
arch/sh/include/mach-ecovec24/mach/romimage.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 - #ifdef __ASSEMBLY__ 2 + #ifdef __ASSEMBLER__ 3 3 4 4 /* EcoVec board specific boot code: 5 5 * converts the "partner-jet-script.txt" script into assembly ··· 22 22 1 : .long 0xa8000000 23 23 2 : 24 24 25 - #else /* __ASSEMBLY__ */ 25 + #else /* __ASSEMBLER__ */ 26 26 27 27 /* Ecovec board specific information: 28 28 * ··· 45 45 __raw_writeb(1 << (nr - 1), PGDR); 46 46 } 47 47 48 - #endif /* __ASSEMBLY__ */ 48 + #endif /* __ASSEMBLER__ */
+3 -3
arch/sh/include/mach-kfr2r09/mach/romimage.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 - #ifdef __ASSEMBLY__ 2 + #ifdef __ASSEMBLER__ 3 3 4 4 /* kfr2r09 board specific boot code: 5 5 * converts the "partner-jet-script.txt" script into assembly ··· 22 22 1: .long 0xa8000000 23 23 2: 24 24 25 - #else /* __ASSEMBLY__ */ 25 + #else /* __ASSEMBLER__ */ 26 26 27 27 static inline void mmcif_update_progress(int nr) 28 28 { 29 29 } 30 30 31 - #endif /* __ASSEMBLY__ */ 31 + #endif /* __ASSEMBLER__ */
-4
arch/sh/kernel/kprobes.c
··· 404 404 int __kprobes kprobe_exceptions_notify(struct notifier_block *self, 405 405 unsigned long val, void *data) 406 406 { 407 - struct kprobe *p = NULL; 408 407 struct die_args *args = (struct die_args *)data; 409 408 int ret = NOTIFY_DONE; 410 - kprobe_opcode_t *addr = NULL; 411 409 struct kprobe_ctlblk *kcb = get_kprobe_ctlblk(); 412 410 413 - addr = (kprobe_opcode_t *) (args->regs->pc); 414 411 if (val == DIE_TRAP && 415 412 args->trapnr == (BREAKPOINT_INSTRUCTION & 0xff)) { 416 413 if (!kprobe_running()) { ··· 418 421 ret = NOTIFY_DONE; 419 422 } 420 423 } else { 421 - p = get_kprobe(addr); 422 424 if ((kcb->kprobe_status == KPROBE_HIT_SS) || 423 425 (kcb->kprobe_status == KPROBE_REENTER)) { 424 426 if (post_kprobe_handler(args->regs))