Skip to content

Commit f563ba4

Browse files
torvaldstorvalds
committed
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
2 parents 7d4e49a + 2132058 commit f563ba4

30 files changed

+61
-60
lines changed

‎arch/parisc/boot/compressed/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ KBUILD_CFLAGS += -fno-PIE -mno-space-regs -mdisable-fpregs -Os
1818
ifndef CONFIG_64BIT
1919
KBUILD_CFLAGS += -mfast-indirect-calls
2020
endif
21+
KBUILD_CFLAGS += -std=gnu11
2122

2223
LDFLAGS_vmlinux := -X -e startup --as-needed -T
2324
$(obj)/vmlinux: $(obj)/vmlinux.lds $(addprefix $(obj)/, $(OBJECTS)) $(LIBGCC) FORCE

‎arch/parisc/include/asm/alternative.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#define INSN_PxTLB 0x02 /* modify pdtlb, pitlb */
1414
#define INSN_NOP 0x08000240 /* nop */
1515

16-
#ifndef __ASSEMBLY__
16+
#ifndef __ASSEMBLER__
1717

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

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

6666
#endif /* __ASM_PARISC_ALTERNATIVE_H */

‎arch/parisc/include/asm/assembly.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
#define SR_TEMP2 2
5454
#define SR_USER 3
5555

56-
#ifdef __ASSEMBLY__
56+
#ifdef __ASSEMBLER__
5757

5858
#ifdef CONFIG_64BIT
5959
#define LDREG ldd
@@ -582,5 +582,5 @@
582582
.previous
583583

584584

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

‎arch/parisc/include/asm/barrier.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include <asm/alternative.h>
66

7-
#ifndef __ASSEMBLY__
7+
#ifndef __ASSEMBLER__
88

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

96-
#endif /* !__ASSEMBLY__ */
96+
#endif /* !__ASSEMBLER__ */
9797
#endif /* __ASM_BARRIER_H */

‎arch/parisc/include/asm/cache.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#define L1_CACHE_BYTES 16
1717
#define L1_CACHE_SHIFT 4
1818

19-
#ifndef __ASSEMBLY__
19+
#ifndef __ASSEMBLER__
2020

2121
#define SMP_CACHE_BYTES L1_CACHE_BYTES
2222

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

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

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

‎arch/parisc/include/asm/current.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#ifndef _ASM_PARISC_CURRENT_H
33
#define _ASM_PARISC_CURRENT_H
44

5-
#ifndef __ASSEMBLY__
5+
#ifndef __ASSEMBLER__
66
struct task_struct;
77

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

1717
#define current get_current()
1818

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

2121
#endif /* _ASM_PARISC_CURRENT_H */

‎arch/parisc/include/asm/dwarf.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef _ASM_PARISC_DWARF_H
77
#define _ASM_PARISC_DWARF_H
88

9-
#ifdef __ASSEMBLY__
9+
#ifdef __ASSEMBLER__
1010

1111
#define CFI_STARTPROC .cfi_startproc
1212
#define CFI_ENDPROC .cfi_endproc
@@ -15,6 +15,6 @@
1515
#define CFI_REL_OFFSET .cfi_rel_offset
1616
#define CFI_UNDEFINED .cfi_undefined
1717

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

2020
#endif /* _ASM_PARISC_DWARF_H */

‎arch/parisc/include/asm/fixmap.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#define KERNEL_MAP_START (GATEWAY_PAGE_SIZE)
4040
#define KERNEL_MAP_END (FIXMAP_START)
4141

42-
#ifndef __ASSEMBLY__
42+
#ifndef __ASSEMBLER__
4343

4444

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

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

6464
#endif /*_ASM_FIXMAP_H*/

‎arch/parisc/include/asm/ftrace.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#ifndef _ASM_PARISC_FTRACE_H
33
#define _ASM_PARISC_FTRACE_H
44

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

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

3030
#define ftrace_return_address(n) return_address(n)
3131

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

3434
#endif /* _ASM_PARISC_FTRACE_H */

‎arch/parisc/include/asm/jump_label.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#ifndef _ASM_PARISC_JUMP_LABEL_H
33
#define _ASM_PARISC_JUMP_LABEL_H
44

5-
#ifndef __ASSEMBLY__
5+
#ifndef __ASSEMBLER__
66

77
#include <linux/types.h>
88
#include <linux/stringify.h>
@@ -44,5 +44,5 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool
4444
return true;
4545
}
4646

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

0 commit comments

Comments
 (0)