mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Xtensa updates for v6.17

Browse source 
- replace __ASSEMBLY__ with __ASSEMBLER__ in arch headers
 -----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCgAxFiEEK2eFS5jlMn3N6xfYUfnMkfg/oEQFAmiV4VMTHGpjbXZia2Jj
 QGdtYWlsLmNvbQAKCRBR+cyR+D+gRLzZD/9M/2944lZ7rWUB0Rtdxq4pldeTeY2e
 Q9ZjsrENi8YsACH0EDPz/azIKYBL2SfM9YH4fagfDlFb0K2ePcvHSeSebpGCF8Z3
 HNcSiyBLxbvcmCfqFSUbNn5Q4IKK+d7iHrOXc1uwMS7ODWbnzPX4xY6aCxk3B9Ic
 EJ0aWzuk/zbe4cFDO27RahMTnK+qJVDX+fkX9PLGvrbYfuG4xlBk9OFVgeV5P1f0
 FIaoFKMyIEDwdCukTA6NJrF4U7JYRgV3/5U0KY+tkfmOVCAo7iuYxAuO0pJLH2oO
 Ojr1yI4r7Mfxe3fYuqHh/sdNA1B1o5efoTpTM49lIRaIt1Y1DUA2Jsn1nPfF0/CG
 kr+nPSKSMmhUxZZFBo2m39mss3tiYcUtyo/L+MxsWEOSHHEJuq0LeExLHH8xEDwy
 NYPh83zzUS0lpHNlO89DaEAa38rt/u4Py0Qy9ydZMnCPyiMg2hYaldweF27k6ugz
 vExqEqNwLxy4+A8pgNiuy0va14ZS+xNakLO1A78YexDCsiK9F7SKZPctOirAGx8N
 evz5Qy8io7CPILuCuVpum2LeL/uzdE2CJg4kg9w0mRNNXCZ52guef8GElvRaaBsS
 tmJKErzD3DrB7+usCrrz/2jnhI+oFN1u5AA705NaXNcxCPCIFmZchkac0Q/E9CFD
 S8+CJIYYf/ysJQ==
 =Jj6J
 -----END PGP SIGNATURE-----

Merge tag 'xtensa-20250808' of https://github.com/jcmvbkbc/linux-xtensa

Pull xtensa update from Max Filippov:

 - replace __ASSEMBLY__ with __ASSEMBLER__ in arch headers

* tag 'xtensa-20250808' of https://github.com/jcmvbkbc/linux-xtensa:
  xtensa: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
  xtensa: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
This commit is contained in:
Linus Torvalds 2025-08-09 07:35:03 +03:00
commit 09aae3ecf8
19 changed files with 43 additions and 43 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
arch/xtensa/include/asm/bootparam.h
View file

@ -27,7 +27,7 @@
#define BP_TAG_FIRST 0x7B0B /* first tag with a version number */ #define BP_TAG_FIRST 0x7B0B /* first tag with a version number */
#define BP_TAG_LAST 0x7E0B /* last tag */ #define BP_TAG_LAST 0x7E0B /* last tag */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
/* All records are aligned to 4 bytes */ /* All records are aligned to 4 bytes */

4
arch/xtensa/include/asm/cmpxchg.h
View file

@ -11,7 +11,7 @@
#ifndef _XTENSA_CMPXCHG_H #ifndef _XTENSA_CMPXCHG_H
#define _XTENSA_CMPXCHG_H #define _XTENSA_CMPXCHG_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <linux/bits.h> #include <linux/bits.h>
#include <linux/stringify.h> #include <linux/stringify.h>
@ -220,6 +220,6 @@ __arch_xchg(unsigned long x, volatile void * ptr, int size)
} }
} }
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* _XTENSA_CMPXCHG_H */ #endif /* _XTENSA_CMPXCHG_H */

8
arch/xtensa/include/asm/coprocessor.h
View file

@ -16,7 +16,7 @@
#include <asm/core.h> #include <asm/core.h>
#include <asm/types.h> #include <asm/types.h>
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLER__
# include <variant/tie-asm.h> # include <variant/tie-asm.h>
.macro xchal_sa_start a b .macro xchal_sa_start a b
@ -69,7 +69,7 @@
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
/* /*
* XTENSA_HAVE_COPROCESSOR(x) returns 1 if coprocessor x is configured. * XTENSA_HAVE_COPROCESSOR(x) returns 1 if coprocessor x is configured.
@ -87,7 +87,7 @@
#define XTENSA_HAVE_IO_PORTS \ #define XTENSA_HAVE_IO_PORTS \
XCHAL_CP_PORT_MASK XCHAL_CP_PORT_MASK
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
/* /*
* Additional registers. * Additional registers.
@ -151,5 +151,5 @@ void local_coprocessors_flush_release_all(void);
#endif /* XTENSA_HAVE_COPROCESSORS */ #endif /* XTENSA_HAVE_COPROCESSORS */
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLER__ */
#endif /* _XTENSA_COPROCESSOR_H */ #endif /* _XTENSA_COPROCESSOR_H */

2
arch/xtensa/include/asm/current.h
View file

@ -13,7 +13,7 @@
#include <asm/thread_info.h> #include <asm/thread_info.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <linux/thread_info.h> #include <linux/thread_info.h>

8
arch/xtensa/include/asm/ftrace.h
View file

@ -12,20 +12,20 @@
#include <asm/processor.h> #include <asm/processor.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
extern unsigned long return_address(unsigned level); extern unsigned long return_address(unsigned level);
#define ftrace_return_address(n) return_address(n) #define ftrace_return_address(n) return_address(n)
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#ifdef CONFIG_FUNCTION_TRACER #ifdef CONFIG_FUNCTION_TRACER
#define MCOUNT_ADDR ((unsigned long)(_mcount)) #define MCOUNT_ADDR ((unsigned long)(_mcount))
#define MCOUNT_INSN_SIZE 3 #define MCOUNT_INSN_SIZE 3
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
extern void _mcount(void); extern void _mcount(void);
#define mcount _mcount #define mcount _mcount
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* CONFIG_FUNCTION_TRACER */ #endif /* CONFIG_FUNCTION_TRACER */
#endif /* _XTENSA_FTRACE_H */ #endif /* _XTENSA_FTRACE_H */

4
arch/xtensa/include/asm/initialize_mmu.h
View file

@ -34,7 +34,7 @@
#define CA_WRITEBACK (0x4) #define CA_WRITEBACK (0x4)
#endif #endif
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLER__
#define XTENSA_HWVERSION_RC_2009_0 230000 #define XTENSA_HWVERSION_RC_2009_0 230000
@ -240,6 +240,6 @@
.endm .endm
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* _XTENSA_INITIALIZE_MMU_H */ #endif /* _XTENSA_INITIALIZE_MMU_H */

4
arch/xtensa/include/asm/jump_label.h
View file

@ -4,7 +4,7 @@
#ifndef _ASM_XTENSA_JUMP_LABEL_H #ifndef _ASM_XTENSA_JUMP_LABEL_H
#define _ASM_XTENSA_JUMP_LABEL_H #define _ASM_XTENSA_JUMP_LABEL_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <linux/types.h> #include <linux/types.h>
@ -61,5 +61,5 @@ struct jump_entry {
jump_label_t key; jump_label_t key;
}; };
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif #endif

2
arch/xtensa/include/asm/kasan.h
View file

@ -2,7 +2,7 @@
#ifndef __ASM_KASAN_H #ifndef __ASM_KASAN_H
#define __ASM_KASAN_H #define __ASM_KASAN_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#ifdef CONFIG_KASAN #ifdef CONFIG_KASAN

2
arch/xtensa/include/asm/kmem_layout.h
View file

@ -80,7 +80,7 @@
#if (!XCHAL_HAVE_PTP_MMU || XCHAL_HAVE_SPANNING_WAY) && defined(CONFIG_USE_OF) #if (!XCHAL_HAVE_PTP_MMU || XCHAL_HAVE_SPANNING_WAY) && defined(CONFIG_USE_OF)
#define XCHAL_KIO_PADDR xtensa_get_kio_paddr() #define XCHAL_KIO_PADDR xtensa_get_kio_paddr()
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
extern unsigned long xtensa_kio_paddr; extern unsigned long xtensa_kio_paddr;
static inline unsigned long xtensa_get_kio_paddr(void) static inline unsigned long xtensa_get_kio_paddr(void)

4
arch/xtensa/include/asm/page.h
View file

@ -80,7 +80,7 @@
#endif #endif
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLER__
#define __pgprot(x) (x) #define __pgprot(x) (x)
@ -172,7 +172,7 @@ static inline unsigned long ___pa(unsigned long va)
#define page_to_virt(page) __va(page_to_pfn(page) << PAGE_SHIFT) #define page_to_virt(page) __va(page_to_pfn(page) << PAGE_SHIFT)
#define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT) #define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#endif /* _XTENSA_PAGE_H */ #endif /* _XTENSA_PAGE_H */

8
arch/xtensa/include/asm/pgtable.h
View file

@ -203,7 +203,7 @@
* What follows is the closest we can get by reasonable means.. * What follows is the closest we can get by reasonable means..
* See linux/mm/mmap.c for protection_map[] array that uses these definitions. * See linux/mm/mmap.c for protection_map[] array that uses these definitions.
*/ */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#define pte_ERROR(e) \ #define pte_ERROR(e) \
printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e)) printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
@ -366,10 +366,10 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte)
return pte; return pte;
} }
#endif /* !defined (__ASSEMBLY__) */ #endif /* !defined (__ASSEMBLER__) */
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLER__
/* Assembly macro _PGD_INDEX is the same as C pgd_index(unsigned long), /* Assembly macro _PGD_INDEX is the same as C pgd_index(unsigned long),
* _PGD_OFFSET as C pgd_offset(struct mm_struct*, unsigned long), * _PGD_OFFSET as C pgd_offset(struct mm_struct*, unsigned long),
@ -408,7 +408,7 @@ void update_mmu_tlb_range(struct vm_area_struct *vma,
unsigned long address, pte_t *ptep, unsigned int nr); unsigned long address, pte_t *ptep, unsigned int nr);
#define update_mmu_tlb_range update_mmu_tlb_range #define update_mmu_tlb_range update_mmu_tlb_range
#endif /* !defined (__ASSEMBLY__) */ #endif /* !defined (__ASSEMBLER__) */
#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR #define __HAVE_ARCH_PTEP_GET_AND_CLEAR

4
arch/xtensa/include/asm/processor.h
View file

@ -105,7 +105,7 @@
#error Unsupported xtensa ABI #error Unsupported xtensa ABI
#endif #endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#if defined(__XTENSA_WINDOWED_ABI__) #if defined(__XTENSA_WINDOWED_ABI__)
@ -263,5 +263,5 @@ static inline unsigned long get_er(unsigned long addr)
#endif /* XCHAL_HAVE_EXTERN_REGS */ #endif /* XCHAL_HAVE_EXTERN_REGS */
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* _XTENSA_PROCESSOR_H */ #endif /* _XTENSA_PROCESSOR_H */

6
arch/xtensa/include/asm/ptrace.h
View file

@ -41,7 +41,7 @@
#define NO_SYSCALL (-1) #define NO_SYSCALL (-1)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <asm/coprocessor.h> #include <asm/coprocessor.h>
#include <asm/core.h> #include <asm/core.h>
@ -106,11 +106,11 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
int do_syscall_trace_enter(struct pt_regs *regs); int do_syscall_trace_enter(struct pt_regs *regs);
void do_syscall_trace_leave(struct pt_regs *regs); void do_syscall_trace_leave(struct pt_regs *regs);
#else /* __ASSEMBLY__ */ #else /* __ASSEMBLER__ */
# include <asm/asm-offsets.h> # include <asm/asm-offsets.h>
#define PT_REGS_OFFSET (KERNEL_STACK_SIZE - PT_USER_SIZE) #define PT_REGS_OFFSET (KERNEL_STACK_SIZE - PT_USER_SIZE)
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLER__ */
#endif /* _XTENSA_PTRACE_H */ #endif /* _XTENSA_PTRACE_H */

4
arch/xtensa/include/asm/signal.h
View file

@ -14,10 +14,10 @@
#include <uapi/asm/signal.h> #include <uapi/asm/signal.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#define __ARCH_HAS_SA_RESTORER #define __ARCH_HAS_SA_RESTORER
#include <asm/sigcontext.h> #include <asm/sigcontext.h>
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* _XTENSA_SIGNAL_H */ #endif /* _XTENSA_SIGNAL_H */

8
arch/xtensa/include/asm/thread_info.h
View file

@ -16,7 +16,7 @@
#define CURRENT_SHIFT KERNEL_STACK_SHIFT #define CURRENT_SHIFT KERNEL_STACK_SHIFT
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
# include <asm/processor.h> # include <asm/processor.h>
#endif #endif
@ -28,7 +28,7 @@
* must also be changed * must also be changed
*/ */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#if XTENSA_HAVE_COPROCESSORS #if XTENSA_HAVE_COPROCESSORS
@ -80,7 +80,7 @@ struct thread_info {
* macros/functions for gaining access to the thread information structure * macros/functions for gaining access to the thread information structure
*/ */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#define INIT_THREAD_INFO(tsk) \ #define INIT_THREAD_INFO(tsk) \
{ \ { \
@ -99,7 +99,7 @@ static __always_inline struct thread_info *current_thread_info(void)
return ti; return ti;
} }
#else /* !__ASSEMBLY__ */ #else /* !__ASSEMBLER__ */
/* how to get the thread information struct from ASM */ /* how to get the thread information struct from ASM */
#define GET_THREAD_INFO(reg,sp) \ #define GET_THREAD_INFO(reg,sp) \

4
arch/xtensa/include/asm/tlbflush.h
View file

@ -20,7 +20,7 @@
#define ITLB_HIT_BIT 3 #define ITLB_HIT_BIT 3
#define DTLB_HIT_BIT 4 #define DTLB_HIT_BIT 4
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
/* TLB flushing: /* TLB flushing:
* *
@ -201,5 +201,5 @@ static inline unsigned long read_itlb_translation (int way)
return tmp; return tmp;
} }
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* _XTENSA_TLBFLUSH_H */ #endif /* _XTENSA_TLBFLUSH_H */

2
arch/xtensa/include/uapi/asm/ptrace.h
View file

@ -42,7 +42,7 @@
#define PTRACE_GETFDPIC_EXEC 0 #define PTRACE_GETFDPIC_EXEC 0
#define PTRACE_GETFDPIC_INTERP 1 #define PTRACE_GETFDPIC_INTERP 1
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
struct user_pt_regs { struct user_pt_regs {
__u32 pc; __u32 pc;

6
arch/xtensa/include/uapi/asm/signal.h
View file

@ -19,7 +19,7 @@
#define _NSIG_BPW 32 #define _NSIG_BPW 32
#define _NSIG_WORDS (_NSIG / _NSIG_BPW) #define _NSIG_WORDS (_NSIG / _NSIG_BPW)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <linux/types.h> #include <linux/types.h>
@ -77,7 +77,7 @@ typedef struct {
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <asm-generic/signal-defs.h> #include <asm-generic/signal-defs.h>
@ -106,5 +106,5 @@ typedef struct sigaltstack {
__kernel_size_t ss_size; __kernel_size_t ss_size;
} stack_t; } stack_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* _UAPI_XTENSA_SIGNAL_H */ #endif /* _UAPI_XTENSA_SIGNAL_H */

4
arch/xtensa/include/uapi/asm/types.h
View file

@ -14,7 +14,7 @@
#include <asm-generic/int-ll64.h> #include <asm-generic/int-ll64.h>
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLER__
# define __XTENSA_UL(x) (x) # define __XTENSA_UL(x) (x)
# define __XTENSA_UL_CONST(x) x # define __XTENSA_UL_CONST(x) x
#else #else
@ -23,7 +23,7 @@
# define __XTENSA_UL_CONST(x) ___XTENSA_UL_CONST(x) # define __XTENSA_UL_CONST(x) ___XTENSA_UL_CONST(x)
#endif #endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#endif #endif