Commit b3154a6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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 cf9e4784 ("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
parents b7191581 8a368260

arch/sh/boards/mach-ecovec24/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -825,6 +825,7 @@ static struct spi_board_info spi_bus[] = { 
/* MSIOF0 */

static struct sh_msiof_spi_info msiof0_data = {

	.num_chipselect = 1,

	.mode = MSIOF_SPI_HOST,

};



static struct resource msiof0_resources[] = {

arch/sh/include/asm/cache.h

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


#define __read_mostly __section(".data..read_mostly")



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__

struct cache_info {

	unsigned int ways;		/* Number of cache ways */

	unsigned int sets;		/* Number of cache sets */
@@ -48,5 +48,5 @@ struct cache_info { 


	unsigned long flags;

};

#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */

#endif /* __ASM_SH_CACHE_H */

arch/sh/include/asm/dwarf.h

+3 −3
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ 
 */

#define DWARF_ARCH_RA_REG	17



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#include <linux/compiler.h>

#include <linux/bug.h>
@@ -379,7 +379,7 @@ extern int module_dwarf_finalize(const Elf_Ehdr *, const Elf_Shdr *, 
				 struct module *);

extern void module_dwarf_cleanup(struct module *);



#endif /* !__ASSEMBLY__ */

#endif /* !__ASSEMBLER__ */



#define CFI_STARTPROC	.cfi_startproc

#define CFI_ENDPROC	.cfi_endproc
@@ -402,7 +402,7 @@ extern void module_dwarf_cleanup(struct module *); 
#define CFI_REL_OFFSET	CFI_IGNORE

#define CFI_UNDEFINED	CFI_IGNORE



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__

static inline void dwarf_unwinder_init(void)

{

}

arch/sh/include/asm/fpu.h

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#ifndef __ASM_SH_FPU_H

#define __ASM_SH_FPU_H



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#include <asm/ptrace.h>
@@ -67,6 +67,6 @@ static inline void clear_fpu(struct task_struct *tsk, struct pt_regs *regs) 
void float_raise(unsigned int flags);

int float_rounding_mode(void);



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */



#endif /* __ASM_SH_FPU_H */

arch/sh/include/asm/ftrace.h

+4 −4
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#define MCOUNT_INSN_SIZE	4 /* sizeof mcount call */

#define FTRACE_SYSCALL_MAX	NR_syscalls



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__

extern void mcount(void);



#define MCOUNT_ADDR		((unsigned long)(mcount))
@@ -35,10 +35,10 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr) 


void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr);



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */

#endif /* CONFIG_FUNCTION_TRACER */



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



/* arch/sh/kernel/return_address.c */

extern void *return_address(unsigned int);
@@ -53,6 +53,6 @@ static inline void arch_ftrace_nmi_enter(void) { } 
static inline void arch_ftrace_nmi_exit(void) { }

#endif



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */



#endif /* __ASM_SH_FTRACE_H */