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 '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

Linus Torvalds f563ba4a 7d4e49a7

+61 -60
+1
arch/parisc/boot/compressed/Makefile
··· 18 18 ifndef CONFIG_64BIT 19 19 KBUILD_CFLAGS += -mfast-indirect-calls 20 20 endif 21 + KBUILD_CFLAGS += -std=gnu11 21 22 22 23 LDFLAGS_vmlinux := -X -e startup --as-needed -T 23 24 $(obj)/vmlinux: $(obj)/vmlinux.lds $(addprefix $(obj)/, $(OBJECTS)) $(LIBGCC) FORCE
+2 -2
arch/parisc/include/asm/alternative.h
··· 13 13 #define INSN_PxTLB 0x02 /* modify pdtlb, pitlb */ 14 14 #define INSN_NOP 0x08000240 /* nop */ 15 15 16 - #ifndef __ASSEMBLY__ 16 + #ifndef __ASSEMBLER__ 17 17 18 18 #include <linux/init.h> 19 19 #include <linux/types.h> ··· 61 61 .word (new_instr_ptr - .) ! \ 62 62 .previous 63 63 64 - #endif /* __ASSEMBLY__ */ 64 + #endif /* __ASSEMBLER__ */ 65 65 66 66 #endif /* __ASM_PARISC_ALTERNATIVE_H */
+2 -2
arch/parisc/include/asm/assembly.h
··· 53 53 #define SR_TEMP2 2 54 54 #define SR_USER 3 55 55 56 - #ifdef __ASSEMBLY__ 56 + #ifdef __ASSEMBLER__ 57 57 58 58 #ifdef CONFIG_64BIT 59 59 #define LDREG ldd ··· 582 582 .previous 583 583 584 584 585 - #endif /* __ASSEMBLY__ */ 585 + #endif /* __ASSEMBLER__ */ 586 586 #endif
+2 -2
arch/parisc/include/asm/barrier.h
··· 4 4 5 5 #include <asm/alternative.h> 6 6 7 - #ifndef __ASSEMBLY__ 7 + #ifndef __ASSEMBLER__ 8 8 9 9 /* The synchronize caches instruction executes as a nop on systems in 10 10 which all memory references are performed in order. */ ··· 93 93 }) 94 94 #include <asm-generic/barrier.h> 95 95 96 - #endif /* !__ASSEMBLY__ */ 96 + #endif /* !__ASSEMBLER__ */ 97 97 #endif /* __ASM_BARRIER_H */
+2 -2
arch/parisc/include/asm/cache.h
··· 16 16 #define L1_CACHE_BYTES 16 17 17 #define L1_CACHE_SHIFT 4 18 18 19 - #ifndef __ASSEMBLY__ 19 + #ifndef __ASSEMBLER__ 20 20 21 21 #define SMP_CACHE_BYTES L1_CACHE_BYTES 22 22 ··· 66 66 ALTERNATIVE(ALT_COND_NO_IOC_FDC, INSN_NOP) :::"memory") 67 67 #define asm_syncdma() asm volatile("syncdma" :::"memory") 68 68 69 - #endif /* ! __ASSEMBLY__ */ 69 + #endif /* ! __ASSEMBLER__ */ 70 70 71 71 /* Classes of processor wrt: disabling space register hashing */ 72 72
+2 -2
arch/parisc/include/asm/current.h
··· 2 2 #ifndef _ASM_PARISC_CURRENT_H 3 3 #define _ASM_PARISC_CURRENT_H 4 4 5 - #ifndef __ASSEMBLY__ 5 + #ifndef __ASSEMBLER__ 6 6 struct task_struct; 7 7 8 8 static __always_inline struct task_struct *get_current(void) ··· 16 16 17 17 #define current get_current() 18 18 19 - #endif /* __ASSEMBLY__ */ 19 + #endif /* __ASSEMBLER__ */ 20 20 21 21 #endif /* _ASM_PARISC_CURRENT_H */
+2 -2
arch/parisc/include/asm/dwarf.h
··· 6 6 #ifndef _ASM_PARISC_DWARF_H 7 7 #define _ASM_PARISC_DWARF_H 8 8 9 - #ifdef __ASSEMBLY__ 9 + #ifdef __ASSEMBLER__ 10 10 11 11 #define CFI_STARTPROC .cfi_startproc 12 12 #define CFI_ENDPROC .cfi_endproc ··· 15 15 #define CFI_REL_OFFSET .cfi_rel_offset 16 16 #define CFI_UNDEFINED .cfi_undefined 17 17 18 - #endif /* __ASSEMBLY__ */ 18 + #endif /* __ASSEMBLER__ */ 19 19 20 20 #endif /* _ASM_PARISC_DWARF_H */
+2 -2
arch/parisc/include/asm/fixmap.h
··· 39 39 #define KERNEL_MAP_START (GATEWAY_PAGE_SIZE) 40 40 #define KERNEL_MAP_END (FIXMAP_START) 41 41 42 - #ifndef __ASSEMBLY__ 42 + #ifndef __ASSEMBLER__ 43 43 44 44 45 45 enum fixed_addresses { ··· 59 59 void set_fixmap(enum fixed_addresses idx, phys_addr_t phys); 60 60 void clear_fixmap(enum fixed_addresses idx); 61 61 62 - #endif /*__ASSEMBLY__*/ 62 + #endif /*__ASSEMBLER__*/ 63 63 64 64 #endif /*_ASM_FIXMAP_H*/
+2 -2
arch/parisc/include/asm/ftrace.h
··· 2 2 #ifndef _ASM_PARISC_FTRACE_H 3 3 #define _ASM_PARISC_FTRACE_H 4 4 5 - #ifndef __ASSEMBLY__ 5 + #ifndef __ASSEMBLER__ 6 6 extern void mcount(void); 7 7 8 8 #define MCOUNT_ADDR ((unsigned long)mcount) ··· 29 29 30 30 #define ftrace_return_address(n) return_address(n) 31 31 32 - #endif /* __ASSEMBLY__ */ 32 + #endif /* __ASSEMBLER__ */ 33 33 34 34 #endif /* _ASM_PARISC_FTRACE_H */
+2 -2
arch/parisc/include/asm/jump_label.h
··· 2 2 #ifndef _ASM_PARISC_JUMP_LABEL_H 3 3 #define _ASM_PARISC_JUMP_LABEL_H 4 4 5 - #ifndef __ASSEMBLY__ 5 + #ifndef __ASSEMBLER__ 6 6 7 7 #include <linux/types.h> 8 8 #include <linux/stringify.h> ··· 44 44 return true; 45 45 } 46 46 47 - #endif /* __ASSEMBLY__ */ 47 + #endif /* __ASSEMBLER__ */ 48 48 #endif
+2 -2
arch/parisc/include/asm/kexec.h
··· 14 14 #define KEXEC_ARCH KEXEC_ARCH_PARISC 15 15 #define ARCH_HAS_KIMAGE_ARCH 16 16 17 - #ifndef __ASSEMBLY__ 17 + #ifndef __ASSEMBLER__ 18 18 19 19 struct kimage_arch { 20 20 unsigned long initrd_start; ··· 28 28 /* Dummy implementation for now */ 29 29 } 30 30 31 - #endif /* __ASSEMBLY__ */ 31 + #endif /* __ASSEMBLER__ */ 32 32 33 33 #endif /* _ASM_PARISC_KEXEC_H */
+1 -1
arch/parisc/include/asm/kgdb.h
··· 21 21 22 22 #define CACHE_FLUSH_IS_SAFE 1 23 23 24 - #ifndef __ASSEMBLY__ 24 + #ifndef __ASSEMBLER__ 25 25 26 26 static inline void arch_kgdb_breakpoint(void) 27 27 {
+2 -2
arch/parisc/include/asm/linkage.h
··· 15 15 */ 16 16 #define ASM_NL ! 17 17 18 - #ifdef __ASSEMBLY__ 18 + #ifdef __ASSEMBLER__ 19 19 20 20 #define ENTRY(name) \ 21 21 ALIGN !\ ··· 35 35 .procend ASM_NL\ 36 36 ENDPROC(name) 37 37 38 - #endif /* __ASSEMBLY__ */ 38 + #endif /* __ASSEMBLER__ */ 39 39 40 40 #endif /* __ASM_PARISC_LINKAGE_H */
+3 -3
arch/parisc/include/asm/page.h
··· 8 8 9 9 #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA 10 10 11 - #ifndef __ASSEMBLY__ 11 + #ifndef __ASSEMBLER__ 12 12 13 13 #include <asm/types.h> 14 14 #include <asm/cache.h> ··· 93 93 extern physmem_range_t pmem_ranges[]; 94 94 extern int npmem_ranges; 95 95 96 - #endif /* !__ASSEMBLY__ */ 96 + #endif /* !__ASSEMBLER__ */ 97 97 98 98 /* WARNING: The definitions below must match exactly to sizeof(pte_t) 99 99 * etc ··· 139 139 #define KERNEL_BINARY_TEXT_START (__PAGE_OFFSET + 0x100000) 140 140 141 141 /* These macros don't work for 64-bit C code -- don't allow in C at all */ 142 - #ifdef __ASSEMBLY__ 142 + #ifdef __ASSEMBLER__ 143 143 # define PA(x) ((x)-__PAGE_OFFSET) 144 144 # define VA(x) ((x)+__PAGE_OFFSET) 145 145 #endif
+2 -2
arch/parisc/include/asm/pdc.h
··· 4 4 5 5 #include <uapi/asm/pdc.h> 6 6 7 - #if !defined(__ASSEMBLY__) 7 + #if !defined(__ASSEMBLER__) 8 8 9 9 extern int parisc_narrow_firmware; 10 10 ··· 109 109 } 110 110 } 111 111 112 - #endif /* !defined(__ASSEMBLY__) */ 112 + #endif /* !defined(__ASSEMBLER__) */ 113 113 #endif /* _PARISC_PDC_H */
+2 -2
arch/parisc/include/asm/pdcpat.h
··· 210 210 #define PDC_PAT_SYSTEM_INFO 76L 211 211 /* PDC_PAT_SYSTEM_INFO uses the same options as PDC_SYSTEM_INFO function. */ 212 212 213 - #ifndef __ASSEMBLY__ 213 + #ifndef __ASSEMBLER__ 214 214 #include <linux/types.h> 215 215 216 216 #ifdef CONFIG_64BIT ··· 389 389 struct pdc_pat_mem_phys_mem_location *pret, 390 390 unsigned long phys_addr); 391 391 392 - #endif /* __ASSEMBLY__ */ 392 + #endif /* __ASSEMBLER__ */ 393 393 394 394 #endif /* ! __PARISC_PATPDC_H */
+4 -4
arch/parisc/include/asm/pgtable.h
··· 12 12 13 13 #include <asm/fixmap.h> 14 14 15 - #ifndef __ASSEMBLY__ 15 + #ifndef __ASSEMBLER__ 16 16 /* 17 17 * we simulate an x86-style page table for the linux mm code 18 18 */ ··· 73 73 mb(); \ 74 74 } while(0) 75 75 76 - #endif /* !__ASSEMBLY__ */ 76 + #endif /* !__ASSEMBLER__ */ 77 77 78 78 #define pte_ERROR(e) \ 79 79 printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e)) ··· 226 226 #define PxD_FLAG_SHIFT (4) 227 227 #define PxD_VALUE_SHIFT (PFN_PTE_SHIFT-PxD_FLAG_SHIFT) 228 228 229 - #ifndef __ASSEMBLY__ 229 + #ifndef __ASSEMBLER__ 230 230 231 231 #define PAGE_NONE __pgprot(_PAGE_PRESENT | _PAGE_USER) 232 232 #define PAGE_SHARED __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE) ··· 471 471 472 472 #define pte_same(A,B) (pte_val(A) == pte_val(B)) 473 473 474 - #endif /* !__ASSEMBLY__ */ 474 + #endif /* !__ASSEMBLER__ */ 475 475 476 476 477 477 /* TLB page size encoding - see table 3-1 in parisc20.pdf */
+2 -2
arch/parisc/include/asm/prefetch.h
··· 16 16 #ifndef __ASM_PARISC_PREFETCH_H 17 17 #define __ASM_PARISC_PREFETCH_H 18 18 19 - #ifndef __ASSEMBLY__ 19 + #ifndef __ASSEMBLER__ 20 20 #ifdef CONFIG_PREFETCH 21 21 22 22 #define ARCH_HAS_PREFETCH ··· 40 40 #endif /* CONFIG_PA20 */ 41 41 42 42 #endif /* CONFIG_PREFETCH */ 43 - #endif /* __ASSEMBLY__ */ 43 + #endif /* __ASSEMBLER__ */ 44 44 45 45 #endif /* __ASM_PARISC_PROCESSOR_H */
+4 -4
arch/parisc/include/asm/processor.h
··· 9 9 #ifndef __ASM_PARISC_PROCESSOR_H 10 10 #define __ASM_PARISC_PROCESSOR_H 11 11 12 - #ifndef __ASSEMBLY__ 12 + #ifndef __ASSEMBLER__ 13 13 #include <linux/threads.h> 14 14 #include <linux/irqreturn.h> 15 15 ··· 20 20 #include <asm/ptrace.h> 21 21 #include <asm/types.h> 22 22 #include <asm/percpu.h> 23 - #endif /* __ASSEMBLY__ */ 23 + #endif /* __ASSEMBLER__ */ 24 24 25 25 #define HAVE_ARCH_PICK_MMAP_LAYOUT 26 26 ··· 45 45 #define STACK_TOP TASK_SIZE 46 46 #define STACK_TOP_MAX DEFAULT_TASK_SIZE 47 47 48 - #ifndef __ASSEMBLY__ 48 + #ifndef __ASSEMBLER__ 49 49 50 50 struct rlimit; 51 51 unsigned long mmap_upper_limit(struct rlimit *rlim_stack); ··· 325 325 extern void lba_set_iregs(struct parisc_device *lba, u32 ibase, u32 imask); 326 326 extern void ccio_cujo20_fixup(struct parisc_device *dev, u32 iovp); 327 327 328 - #endif /* __ASSEMBLY__ */ 328 + #endif /* __ASSEMBLER__ */ 329 329 330 330 #endif /* __ASM_PARISC_PROCESSOR_H */
+2 -2
arch/parisc/include/asm/psw.h
··· 60 60 #define USER_PSW_MASK (WIDE_PSW | PSW_T | PSW_N | PSW_X | PSW_B | PSW_V | PSW_CB) 61 61 #define USER_PSW (PSW_C | PSW_Q | PSW_P | PSW_D | PSW_I) 62 62 63 - #ifndef __ASSEMBLY__ 63 + #ifndef __ASSEMBLER__ 64 64 65 65 /* The program status word as bitfields. */ 66 66 struct pa_psw { ··· 99 99 #define pa_psw(task) ((struct pa_psw *) ((char *) (task) + TASK_PT_PSW)) 100 100 #endif 101 101 102 - #endif /* !__ASSEMBLY__ */ 102 + #endif /* !__ASSEMBLER__ */ 103 103 104 104 #endif
+2 -2
arch/parisc/include/asm/signal.h
··· 4 4 5 5 #include <uapi/asm/signal.h> 6 6 7 - # ifndef __ASSEMBLY__ 7 + # ifndef __ASSEMBLER__ 8 8 9 9 /* Most things should be clean enough to redefine this at will, if care 10 10 is taken to make libc match. */ 11 11 12 12 #include <asm/sigcontext.h> 13 13 14 - #endif /* !__ASSEMBLY */ 14 + #endif /* !__ASSEMBLER__ */ 15 15 #endif /* _ASM_PARISC_SIGNAL_H */
+2 -2
arch/parisc/include/asm/smp.h
··· 12 12 #define PDC_OS_BOOT_RENDEZVOUS 0x10 13 13 #define PDC_OS_BOOT_RENDEZVOUS_HI 0x28 14 14 15 - #ifndef ASSEMBLY 15 + #ifndef __ASSEMBLER__ 16 16 #include <linux/bitops.h> 17 17 #include <linux/threads.h> /* for NR_CPUS */ 18 18 #include <linux/cpumask.h> ··· 34 34 35 35 #define raw_smp_processor_id() (current_thread_info()->cpu) 36 36 37 - #endif /* !ASSEMBLY */ 37 + #endif /* !__ASSEMBLER__ */ 38 38 39 39 #else /* CONFIG_SMP */ 40 40
+2 -2
arch/parisc/include/asm/spinlock_types.h
··· 6 6 7 7 #define SPINLOCK_BREAK_INSN 0x0000c006 /* break 6,6 */ 8 8 9 - #ifndef __ASSEMBLY__ 9 + #ifndef __ASSEMBLER__ 10 10 11 11 typedef struct { 12 12 volatile unsigned int lock[4]; ··· 26 26 volatile unsigned int counter; 27 27 } arch_rwlock_t; 28 28 29 - #endif /* __ASSEMBLY__ */ 29 + #endif /* __ASSEMBLER__ */ 30 30 31 31 #define __ARCH_RW_LOCK_UNLOCKED__ 0x01000000 32 32 #define __ARCH_RW_LOCK_UNLOCKED { .lock_mutex = __ARCH_SPIN_LOCK_UNLOCKED, \
+2 -2
arch/parisc/include/asm/thread_info.h
··· 2 2 #ifndef _ASM_PARISC_THREAD_INFO_H 3 3 #define _ASM_PARISC_THREAD_INFO_H 4 4 5 - #ifndef __ASSEMBLY__ 5 + #ifndef __ASSEMBLER__ 6 6 #include <asm/processor.h> 7 7 #include <asm/special_insns.h> 8 8 ··· 20 20 .preempt_count = INIT_PREEMPT_COUNT, \ 21 21 } 22 22 23 - #endif /* !__ASSEMBLY */ 23 + #endif /* !__ASSEMBLER__ */ 24 24 25 25 /* thread information allocation */ 26 26
+1 -1
arch/parisc/include/asm/traps.h
··· 4 4 5 5 #define PARISC_ITLB_TRAP 6 /* defined by architecture. Do not change. */ 6 6 7 - #if !defined(__ASSEMBLY__) 7 + #if !defined(__ASSEMBLER__) 8 8 struct pt_regs; 9 9 10 10 /* traps.c */
+2 -2
arch/parisc/include/asm/unistd.h
··· 6 6 7 7 #define __NR_Linux_syscalls __NR_syscalls 8 8 9 - #ifndef __ASSEMBLY__ 9 + #ifndef __ASSEMBLER__ 10 10 11 11 #define SYS_ify(syscall_name) __NR_##syscall_name 12 12 ··· 144 144 #define __ARCH_WANT_SYS_UTIME 145 145 #endif 146 146 147 - #endif /* __ASSEMBLY__ */ 147 + #endif /* __ASSEMBLER__ */ 148 148 149 149 #undef STR 150 150
+2 -2
arch/parisc/include/asm/vdso.h
··· 2 2 #ifndef __PARISC_VDSO_H__ 3 3 #define __PARISC_VDSO_H__ 4 4 5 - #ifndef __ASSEMBLY__ 5 + #ifndef __ASSEMBLER__ 6 6 7 7 #ifdef CONFIG_64BIT 8 8 #include <generated/vdso64-offsets.h> ··· 12 12 #define VDSO64_SYMBOL(tsk, name) ((tsk)->mm->context.vdso_base + (vdso64_offset_##name)) 13 13 #define VDSO32_SYMBOL(tsk, name) ((tsk)->mm->context.vdso_base + (vdso32_offset_##name)) 14 14 15 - #endif /* __ASSEMBLY __ */ 15 + #endif /* __ASSEMBLER__ */ 16 16 17 17 /* Default link addresses for the vDSOs */ 18 18 #define VDSO_LBASE 0
+2 -2
arch/parisc/include/uapi/asm/pdc.h
··· 361 361 /* size of the pdc_result buffer for firmware.c */ 362 362 #define NUM_PDC_RESULT 32 363 363 364 - #if !defined(__ASSEMBLY__) 364 + #if !defined(__ASSEMBLER__) 365 365 366 366 /* flags for hardware_path */ 367 367 #define PF_AUTOBOOT 0x80 ··· 741 741 #define PIRANHA_CPU_ID 0x13 742 742 #define MAKO_CPU_ID 0x14 743 743 744 - #endif /* !defined(__ASSEMBLY__) */ 744 + #endif /* !defined(__ASSEMBLER__) */ 745 745 746 746 #endif /* _UAPI_PARISC_PDC_H */
+2 -2
arch/parisc/include/uapi/asm/signal.h
··· 61 61 #define _NSIG_BPW (sizeof(unsigned long) * 8) 62 62 #define _NSIG_WORDS (_NSIG / _NSIG_BPW) 63 63 64 - # ifndef __ASSEMBLY__ 64 + # ifndef __ASSEMBLER__ 65 65 66 66 # include <linux/types.h> 67 67 ··· 80 80 __kernel_size_t ss_size; 81 81 } stack_t; 82 82 83 - #endif /* !__ASSEMBLY */ 83 + #endif /* !__ASSEMBLER__ */ 84 84 #endif /* _UAPI_ASM_PARISC_SIGNAL_H */
+1 -1
arch/parisc/kernel/unaligned.c
··· 25 25 #define DPRINTF(fmt, args...) 26 26 #endif 27 27 28 - #define RFMT "%#08lx" 28 + #define RFMT "0x%08lx" 29 29 30 30 /* 1111 1100 0000 0000 0001 0011 1100 0000 */ 31 31 #define OPCODE1(a,b,c) ((a)<<26|(b)<<12|(c)<<6)