parisc architecture updates for kernel v6.16-rc1:

Fix building with gcc-15, formatting fix on unaligned warnings and replace __ASSEMBLY__ with __ASSEMBLER__ in headers. -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQS86RI+GtKfB8BJu973ErUQojoPXwUCaDs2YwAKCRD3ErUQojoP XypmAQCK6kbfBqWu/IjGSrUozOJukhL0TVEzc4ESCpgROElA7QEAzMlVzinOE27u vd68mTqAiaamAKCezwC3QMbkA+0+eAM= =TMG6 -----END PGP SIGNATURE----- Merge tag 'parisc-for-6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux Pull parisc updates from Helge Deller: "Fix building with gcc-15, formatting fix on unaligned warnings and replace __ASSEMBLY__ with __ASSEMBLER__ in headers" * tag 'parisc-for-6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc/unaligned: Fix hex output to show 8 hex chars parisc: fix building with gcc-15 parisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers parisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-10-22 23:13:01 +02:00 · 2025-06-01 08:55:28 -07:00 · 2025-06-01 08:55:28 -07:00 · f563ba4ac6
commit f563ba4ac6
parent 7d4e49a77d 213205889d
30 changed files with 61 additions and 60 deletions
--- a/arch/parisc/boot/compressed/Makefile
+++ b/arch/parisc/boot/compressed/Makefile
@ -18,6 +18,7 @@ KBUILD_CFLAGS += -fno-PIE -mno-space-regs -mdisable-fpregs -Os
 ifndef CONFIG_64BIT
 KBUILD_CFLAGS += -mfast-indirect-calls
 endif
+KBUILD_CFLAGS += -std=gnu11

 LDFLAGS_vmlinux := -X -e startup --as-needed -T
 $(obj)/vmlinux: $(obj)/vmlinux.lds $(addprefix $(obj)/, $(OBJECTS)) $(LIBGCC) FORCE
--- a/arch/parisc/include/asm/alternative.h
+++ b/arch/parisc/include/asm/alternative.h
@ -13,7 +13,7 @@
 #define INSN_PxTLB	0x02		/* modify pdtlb, pitlb */
 #define INSN_NOP	0x08000240	/* nop */

-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__

 #include <linux/init.h>
 #include <linux/types.h>
@ -61,6 +61,6 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end,
 	.word (new_instr_ptr - .)	!	\
 	.previous

-#endif  /*  __ASSEMBLY__  */
+#endif  /*  __ASSEMBLER__  */

 #endif /* __ASM_PARISC_ALTERNATIVE_H */
--- a/arch/parisc/include/asm/assembly.h
+++ b/arch/parisc/include/asm/assembly.h
@ -53,7 +53,7 @@
 #define SR_TEMP2	2
 #define SR_USER		3

-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__

 #ifdef CONFIG_64BIT
 #define LDREG	ldd
@ -582,5 +582,5 @@
 	.previous


-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
 #endif
--- a/arch/parisc/include/asm/barrier.h
+++ b/arch/parisc/include/asm/barrier.h
@ -4,7 +4,7 @@

 #include <asm/alternative.h>

-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__

 /* The synchronize caches instruction executes as a nop on systems in
   which all memory references are performed in order. */
@ -93,5 +93,5 @@ do {									\
 })
 #include <asm-generic/barrier.h>

-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
 #endif /* __ASM_BARRIER_H */
--- a/arch/parisc/include/asm/cache.h
+++ b/arch/parisc/include/asm/cache.h
@ -16,7 +16,7 @@
 #define L1_CACHE_BYTES 16
 #define L1_CACHE_SHIFT 4

-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__

 #define SMP_CACHE_BYTES L1_CACHE_BYTES

@ -66,7 +66,7 @@ void parisc_setup_cache_timing(void);
 			ALTERNATIVE(ALT_COND_NO_IOC_FDC, INSN_NOP) :::"memory")
 #define asm_syncdma()	asm volatile("syncdma" :::"memory")

-#endif /* ! __ASSEMBLY__ */
+#endif /* ! __ASSEMBLER__ */

 /* Classes of processor wrt: disabling space register hashing */

--- a/arch/parisc/include/asm/current.h
+++ b/arch/parisc/include/asm/current.h
@ -2,7 +2,7 @@
 #ifndef _ASM_PARISC_CURRENT_H
 #define _ASM_PARISC_CURRENT_H

-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 struct task_struct;

 static __always_inline struct task_struct *get_current(void)
@ -16,6 +16,6 @@ static __always_inline struct task_struct *get_current(void)

 #define current get_current()

-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */

 #endif /* _ASM_PARISC_CURRENT_H */
--- a/arch/parisc/include/asm/dwarf.h
+++ b/arch/parisc/include/asm/dwarf.h
@ -6,7 +6,7 @@
 #ifndef _ASM_PARISC_DWARF_H
 #define _ASM_PARISC_DWARF_H

-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__

 #define CFI_STARTPROC	.cfi_startproc
 #define CFI_ENDPROC	.cfi_endproc
@ -15,6 +15,6 @@
 #define CFI_REL_OFFSET	.cfi_rel_offset
 #define CFI_UNDEFINED	.cfi_undefined

-#endif	/* __ASSEMBLY__ */
+#endif	/* __ASSEMBLER__ */

 #endif	/* _ASM_PARISC_DWARF_H */
--- a/arch/parisc/include/asm/fixmap.h
+++ b/arch/parisc/include/asm/fixmap.h
@ -39,7 +39,7 @@
 #define KERNEL_MAP_START	(GATEWAY_PAGE_SIZE)
 #define KERNEL_MAP_END		(FIXMAP_START)

-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__


 enum fixed_addresses {
@ -59,6 +59,6 @@ extern void *parisc_vmalloc_start;
 void set_fixmap(enum fixed_addresses idx, phys_addr_t phys);
 void clear_fixmap(enum fixed_addresses idx);

-#endif /*__ASSEMBLY__*/
+#endif /*__ASSEMBLER__*/

 #endif /*_ASM_FIXMAP_H*/
--- a/arch/parisc/include/asm/ftrace.h
+++ b/arch/parisc/include/asm/ftrace.h
@ -2,7 +2,7 @@
 #ifndef _ASM_PARISC_FTRACE_H
 #define _ASM_PARISC_FTRACE_H

-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 extern void mcount(void);

 #define MCOUNT_ADDR		((unsigned long)mcount)
@ -29,6 +29,6 @@ unsigned long ftrace_call_adjust(unsigned long addr);

 #define ftrace_return_address(n) return_address(n)

-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */

 #endif /* _ASM_PARISC_FTRACE_H */
--- a/arch/parisc/include/asm/jump_label.h
+++ b/arch/parisc/include/asm/jump_label.h
@ -2,7 +2,7 @@
 #ifndef _ASM_PARISC_JUMP_LABEL_H
 #define _ASM_PARISC_JUMP_LABEL_H

-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__

 #include <linux/types.h>
 #include <linux/stringify.h>
@ -44,5 +44,5 @@ l_yes:
 	return true;
 }

-#endif  /* __ASSEMBLY__ */
+#endif  /* __ASSEMBLER__ */
 #endif
--- a/arch/parisc/include/asm/kexec.h
+++ b/arch/parisc/include/asm/kexec.h
@ -14,7 +14,7 @@
 #define KEXEC_ARCH KEXEC_ARCH_PARISC
 #define ARCH_HAS_KIMAGE_ARCH

-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__

 struct kimage_arch {
 	unsigned long initrd_start;
@ -28,6 +28,6 @@ static inline void crash_setup_regs(struct pt_regs *newregs,
 	/* Dummy implementation for now */
 }

-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */

 #endif /* _ASM_PARISC_KEXEC_H */
--- a/arch/parisc/include/asm/kgdb.h
+++ b/arch/parisc/include/asm/kgdb.h
@ -21,7 +21,7 @@

 #define CACHE_FLUSH_IS_SAFE		1

-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__

 static inline void arch_kgdb_breakpoint(void)
 {
--- a/arch/parisc/include/asm/linkage.h
+++ b/arch/parisc/include/asm/linkage.h
@ -15,7 +15,7 @@
 */
 #define ASM_NL	!

-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__

 #define ENTRY(name) \
 	ALIGN	!\
@ -35,6 +35,6 @@ name:		ASM_NL\
 	.procend	ASM_NL\
 	ENDPROC(name)

-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */

 #endif  /* __ASM_PARISC_LINKAGE_H */
--- a/arch/parisc/include/asm/page.h
+++ b/arch/parisc/include/asm/page.h
@ -8,7 +8,7 @@

 #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA

-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__

 #include <asm/types.h>
 #include <asm/cache.h>
@ -93,7 +93,7 @@ typedef struct __physmem_range {
 extern physmem_range_t pmem_ranges[];
 extern int npmem_ranges;

-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */

 /* WARNING: The definitions below must match exactly to sizeof(pte_t)
 * etc
@ -139,7 +139,7 @@ extern int npmem_ranges;
 #define KERNEL_BINARY_TEXT_START	(__PAGE_OFFSET + 0x100000)

 /* These macros don't work for 64-bit C code -- don't allow in C at all */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
 #   define PA(x)	((x)-__PAGE_OFFSET)
 #   define VA(x)	((x)+__PAGE_OFFSET)
 #endif
--- a/arch/parisc/include/asm/pdc.h
+++ b/arch/parisc/include/asm/pdc.h
@ -4,7 +4,7 @@

 #include <uapi/asm/pdc.h>

-#if !defined(__ASSEMBLY__)
+#if !defined(__ASSEMBLER__)

 extern int parisc_narrow_firmware;

@ -109,5 +109,5 @@ static inline char * os_id_to_string(u16 os_id) {
 	}
 }

-#endif /* !defined(__ASSEMBLY__) */
+#endif /* !defined(__ASSEMBLER__) */
 #endif /* _PARISC_PDC_H */
--- a/arch/parisc/include/asm/pdcpat.h
+++ b/arch/parisc/include/asm/pdcpat.h
@ -210,7 +210,7 @@
 #define PDC_PAT_SYSTEM_INFO	76L
 /* PDC_PAT_SYSTEM_INFO uses the same options as PDC_SYSTEM_INFO function. */

-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 #include <linux/types.h>

 #ifdef CONFIG_64BIT
@ -389,6 +389,6 @@ extern int pdc_pat_mem_get_dimm_phys_location(
                struct pdc_pat_mem_phys_mem_location *pret,
                unsigned long phys_addr);

-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */

 #endif /* ! __PARISC_PATPDC_H */
--- a/arch/parisc/include/asm/pgtable.h
+++ b/arch/parisc/include/asm/pgtable.h
@ -12,7 +12,7 @@

 #include <asm/fixmap.h>

-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 /*
 * we simulate an x86-style page table for the linux mm code
 */
@ -73,7 +73,7 @@ extern void __update_cache(pte_t pte);
 		mb();				\
 	} while(0)

-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */

 #define pte_ERROR(e) \
 	printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
@ -226,7 +226,7 @@ extern void __update_cache(pte_t pte);
 #define PxD_FLAG_SHIFT    (4)
 #define PxD_VALUE_SHIFT   (PFN_PTE_SHIFT-PxD_FLAG_SHIFT)

-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__

 #define PAGE_NONE	__pgprot(_PAGE_PRESENT | _PAGE_USER)
 #define PAGE_SHARED	__pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE)
@ -471,7 +471,7 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,

 #define pte_same(A,B)	(pte_val(A) == pte_val(B))

-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */


 /* TLB page size encoding - see table 3-1 in parisc20.pdf */
--- a/arch/parisc/include/asm/prefetch.h
+++ b/arch/parisc/include/asm/prefetch.h
@ -16,7 +16,7 @@
 #ifndef __ASM_PARISC_PREFETCH_H
 #define __ASM_PARISC_PREFETCH_H

-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 #ifdef CONFIG_PREFETCH

 #define ARCH_HAS_PREFETCH
@ -40,6 +40,6 @@ static inline void prefetchw(const void *addr)
 #endif /* CONFIG_PA20 */

 #endif /* CONFIG_PREFETCH */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */

 #endif /* __ASM_PARISC_PROCESSOR_H */
--- a/arch/parisc/include/asm/processor.h
+++ b/arch/parisc/include/asm/processor.h
@ -9,7 +9,7 @@
 #ifndef __ASM_PARISC_PROCESSOR_H
 #define __ASM_PARISC_PROCESSOR_H

-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 #include <linux/threads.h>
 #include <linux/irqreturn.h>

@ -20,7 +20,7 @@
 #include <asm/ptrace.h>
 #include <asm/types.h>
 #include <asm/percpu.h>
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */

 #define HAVE_ARCH_PICK_MMAP_LAYOUT

@ -45,7 +45,7 @@
 #define STACK_TOP	TASK_SIZE
 #define STACK_TOP_MAX	DEFAULT_TASK_SIZE

-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__

 struct rlimit;
 unsigned long mmap_upper_limit(struct rlimit *rlim_stack);
@ -325,6 +325,6 @@ extern void sba_directed_lmmio(struct parisc_device *, struct resource *);
 extern void lba_set_iregs(struct parisc_device *lba, u32 ibase, u32 imask);
 extern void ccio_cujo20_fixup(struct parisc_device *dev, u32 iovp);

-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */

 #endif /* __ASM_PARISC_PROCESSOR_H */
--- a/arch/parisc/include/asm/psw.h
+++ b/arch/parisc/include/asm/psw.h
@ -60,7 +60,7 @@
 #define USER_PSW_MASK (WIDE_PSW | PSW_T | PSW_N | PSW_X | PSW_B | PSW_V | PSW_CB)
 #define USER_PSW      (PSW_C | PSW_Q | PSW_P | PSW_D | PSW_I)

-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__

 /* The program status word as bitfields.  */
 struct pa_psw {
@ -99,6 +99,6 @@ struct pa_psw {
 #define pa_psw(task) ((struct pa_psw *) ((char *) (task) + TASK_PT_PSW))
 #endif

-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */

 #endif
--- a/arch/parisc/include/asm/signal.h
+++ b/arch/parisc/include/asm/signal.h
@ -4,12 +4,12 @@

 #include <uapi/asm/signal.h>

-# ifndef __ASSEMBLY__
+# ifndef __ASSEMBLER__

 /* Most things should be clean enough to redefine this at will, if care
   is taken to make libc match.  */

 #include <asm/sigcontext.h>

-#endif /* !__ASSEMBLY */
+#endif /* !__ASSEMBLER__ */
 #endif /* _ASM_PARISC_SIGNAL_H */
--- a/arch/parisc/include/asm/smp.h
+++ b/arch/parisc/include/asm/smp.h
@ -12,7 +12,7 @@ extern int init_per_cpu(int cpuid);
 #define PDC_OS_BOOT_RENDEZVOUS     0x10
 #define PDC_OS_BOOT_RENDEZVOUS_HI  0x28

-#ifndef ASSEMBLY
+#ifndef __ASSEMBLER__
 #include <linux/bitops.h>
 #include <linux/threads.h>	/* for NR_CPUS */
 #include <linux/cpumask.h>
@ -34,7 +34,7 @@ extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);

 #define raw_smp_processor_id()		(current_thread_info()->cpu)

-#endif /* !ASSEMBLY */
+#endif /* !__ASSEMBLER__ */

 #else /* CONFIG_SMP */

--- a/arch/parisc/include/asm/spinlock_types.h
+++ b/arch/parisc/include/asm/spinlock_types.h
@ -6,7 +6,7 @@

 #define SPINLOCK_BREAK_INSN	0x0000c006	/* break 6,6 */

-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__

 typedef struct {
 	volatile unsigned int lock[4];
@ -26,7 +26,7 @@ typedef struct {
 	volatile unsigned int	counter;
 } arch_rwlock_t;

-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */

 #define __ARCH_RW_LOCK_UNLOCKED__       0x01000000
 #define __ARCH_RW_LOCK_UNLOCKED         { .lock_mutex = __ARCH_SPIN_LOCK_UNLOCKED, \
--- a/arch/parisc/include/asm/thread_info.h
+++ b/arch/parisc/include/asm/thread_info.h
@ -2,7 +2,7 @@
 #ifndef _ASM_PARISC_THREAD_INFO_H
 #define _ASM_PARISC_THREAD_INFO_H

-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 #include <asm/processor.h>
 #include <asm/special_insns.h>

@ -20,7 +20,7 @@ struct thread_info {
 	.preempt_count	= INIT_PREEMPT_COUNT,	\
 }

-#endif /* !__ASSEMBLY */
+#endif /* !__ASSEMBLER__ */

 /* thread information allocation */

--- a/arch/parisc/include/asm/traps.h
+++ b/arch/parisc/include/asm/traps.h
@ -4,7 +4,7 @@

 #define PARISC_ITLB_TRAP	6 /* defined by architecture. Do not change. */

-#if !defined(__ASSEMBLY__)
+#if !defined(__ASSEMBLER__)
 struct pt_regs;

 /* traps.c */
--- a/arch/parisc/include/asm/unistd.h
+++ b/arch/parisc/include/asm/unistd.h
@ -6,7 +6,7 @@

 #define __NR_Linux_syscalls	__NR_syscalls

-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__

 #define SYS_ify(syscall_name)   __NR_##syscall_name

@ -144,7 +144,7 @@
 #define __ARCH_WANT_SYS_UTIME
 #endif

-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */

 #undef STR

--- a/arch/parisc/include/asm/vdso.h
+++ b/arch/parisc/include/asm/vdso.h
@ -2,7 +2,7 @@
 #ifndef __PARISC_VDSO_H__
 #define __PARISC_VDSO_H__

-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__

 #ifdef CONFIG_64BIT
 #include <generated/vdso64-offsets.h>
@ -12,7 +12,7 @@
 #define VDSO64_SYMBOL(tsk, name) ((tsk)->mm->context.vdso_base + (vdso64_offset_##name))
 #define VDSO32_SYMBOL(tsk, name) ((tsk)->mm->context.vdso_base + (vdso32_offset_##name))

-#endif /* __ASSEMBLY __ */
+#endif /* __ASSEMBLER__ */

 /* Default link addresses for the vDSOs */
 #define VDSO_LBASE	0
--- a/arch/parisc/include/uapi/asm/pdc.h
+++ b/arch/parisc/include/uapi/asm/pdc.h
@ -361,7 +361,7 @@
 /* size of the pdc_result buffer for firmware.c */
 #define NUM_PDC_RESULT	32

-#if !defined(__ASSEMBLY__)
+#if !defined(__ASSEMBLER__)

 /* flags for hardware_path */
 #define	PF_AUTOBOOT	0x80
@ -741,6 +741,6 @@ struct pdc_firm_test_get_rtn_block {   /* PDC_MODEL/PDC_FIRM_TEST_GET */
 #define PIRANHA_CPU_ID		0x13
 #define MAKO_CPU_ID		0x14

-#endif /* !defined(__ASSEMBLY__) */
+#endif /* !defined(__ASSEMBLER__) */

 #endif /* _UAPI_PARISC_PDC_H */
--- a/arch/parisc/include/uapi/asm/signal.h
+++ b/arch/parisc/include/uapi/asm/signal.h
@ -61,7 +61,7 @@
 #define _NSIG_BPW	(sizeof(unsigned long) * 8)
 #define _NSIG_WORDS	(_NSIG / _NSIG_BPW)

-# ifndef __ASSEMBLY__
+# ifndef __ASSEMBLER__

 #  include <linux/types.h>

@ -80,5 +80,5 @@ typedef struct sigaltstack {
 	__kernel_size_t ss_size;
 } stack_t;

-#endif /* !__ASSEMBLY */
+#endif /* !__ASSEMBLER__ */
 #endif /* _UAPI_ASM_PARISC_SIGNAL_H */
--- a/arch/parisc/kernel/unaligned.c
+++ b/arch/parisc/kernel/unaligned.c
@ -25,7 +25,7 @@
 #define DPRINTF(fmt, args...)
 #endif

-#define RFMT "%#08lx"
+#define RFMT "0x%08lx"

 /* 1111 1100 0000 0000 0001 0011 1100 0000 */
 #define OPCODE1(a,b,c)	((a)<<26|(b)<<12|(c)<<6)