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

Merge tag 'parisc-for-6.16-rc1' of... 

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
parents 7d4e49a7 21320588

arch/parisc/boot/compressed/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/parisc/include/asm/alternative.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */

arch/parisc/include/asm/assembly.h

+2 −2
Original line number Diff line number Diff line
@@ -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

arch/parisc/include/asm/barrier.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */

arch/parisc/include/asm/cache.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */