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

Merge tag 'sparc-for-6.18-tag1' of... 

Merge tag 'sparc-for-6.18-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc

Pull sparc updates from Andreas Larsson:

 - Add relocation handling for R_SPARC_UA64 for sparc64 that is
   generated by llvm and clarify printout on missing relocation handler

 - Fix missing hugetlb tte initialization for sun4u

 - Code cleanup for redundant use of __GPF_NOWARN for sparc64

 - Fix prototypes of reads[bwl]() for sparc64 by adding missing const
   and volatile pointer qualifiers

 - Fix bugs in accurate exception reporting in multiple machine specific
   sparc64 variants of copy_{from,to}_user() for sparc64

 - Fix memory leak in error handling for sparc32

 - Drop -ansi from asflags and replace __ASSEMBLY__ with __ASSEMBLER__
   in headers for all arch/sparc

 - Replace strcpy() with strscpy() for all arch/sparc

* tag 'sparc-for-6.18-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc: (22 commits)
  sparc: Replace deprecated strcpy() with strscpy() in handle_nextprop_quirks()
  sparc64: Replace deprecated strcpy() with strscpy() in build_path_component()
  sparc: Replace deprecated strcpy() with strscpy() in prom_32.c
  sparc: Replace deprecated strcpy() with strscpy() in domain services driver
  sparc64: Replace deprecated strcpy() with strscpy() in prom_nextprop()
  sparc: floppy: Replace deprecated strcpy() with strscpy() in sun_floppy_init()
  sparc: parport: Replace deprecated strcpy() with strscpy() in ecpp_probe()
  sparc: PCI: Replace deprecated strcpy() with strscpy()
  sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
  sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
  sparc: Drop the "-ansi" from the asflags
  sparc: fix error handling in scan_one_device()
  sparc: fix accurate exception reporting in copy_{from,to}_user for M7
  sparc: fix accurate exception reporting in copy_to_user for Niagara 4
  sparc: fix accurate exception reporting in copy_{from_to}_user for Niagara
  sparc: fix accurate exception reporting in copy_{from_to}_user for UltraSPARC III
  sparc: fix accurate exception reporting in copy_{from_to}_user for UltraSPARC
  sparc64: fix prototypes of reads[bwl]()
  sparc64: Remove redundant __GFP_NOWARN
  sparc64: fix hugetlb for sun4u
  ...
parents 86bcf7be fe012670

arch/sparc/include/asm/adi_64.h

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


#include <linux/types.h>



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



struct adi_caps {

	__u64 blksz;
@@ -41,6 +41,6 @@ static inline unsigned long adi_nbits(void) 
	return adi_state.caps.nbits;

}



#endif	/* __ASSEMBLY__ */

#endif	/* __ASSEMBLER__ */



#endif	/* !(__ASM_SPARC64_ADI_H) */

arch/sparc/include/asm/auxio.h

+2 −2
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 
#ifndef ___ASM_SPARC_AUXIO_H

#define ___ASM_SPARC_AUXIO_H



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



extern void __iomem *auxio_register;



#endif /* ifndef __ASSEMBLY__ */

#endif /* ifndef __ASSEMBLER__ */



#if defined(__sparc__) && defined(__arch64__)

#include <asm/auxio_64.h>

arch/sparc/include/asm/auxio_32.h

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#define AUXIO_FLPY_EJCT   0x02    /* Eject floppy disk.  Write only. */

#define AUXIO_LED         0x01    /* On if set, off if unset. Read/Write */



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



/*

 * NOTE: these routines are implementation dependent--
@@ -75,7 +75,7 @@ do { \ 
	} \

} while (0)



#endif /* !(__ASSEMBLY__) */

#endif /* !(__ASSEMBLER__) */





/* AUXIO2 (Power Off Control) */

arch/sparc/include/asm/auxio_64.h

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
#define AUXIO_PCIO_CPWR_OFF	0x02 /* Courtesy Power Off	*/

#define AUXIO_PCIO_SPWR_OFF	0x01 /* System Power Off	*/



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#define AUXIO_LTE_ON	1

#define AUXIO_LTE_OFF	0
@@ -94,6 +94,6 @@ void auxio_set_lte(int on); 
 */

void auxio_set_led(int on);



#endif /* ifndef __ASSEMBLY__ */

#endif /* ifndef __ASSEMBLER__ */



#endif /* !(_SPARC64_AUXIO_H) */

arch/sparc/include/asm/cacheflush_64.h

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


#include <asm/page.h>



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#include <linux/mm.h>
@@ -78,6 +78,6 @@ void flush_ptrace_access(struct vm_area_struct *, struct page *, 
#define flush_cache_vmap_early(start, end)	do { } while (0)

#define flush_cache_vunmap(start, end)		do { } while (0)



#endif /* !__ASSEMBLY__ */

#endif /* !__ASSEMBLER__ */



#endif /* _SPARC64_CACHEFLUSH_H */