Skip to content

Commit c4c8bca

Browse files
torvaldstorvalds
committed
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 ...
2 parents 86bcf7b + fe01267 commit c4c8bca

84 files changed

Lines changed: 312 additions & 262 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎arch/sparc/include/asm/adi_64.h‎

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

1010
#include <linux/types.h>
1111

12-
#ifndef __ASSEMBLY__
12+
#ifndef __ASSEMBLER__
1313

1414
struct adi_caps {
1515
__u64 blksz;
@@ -41,6 +41,6 @@ static inline unsigned long adi_nbits(void)
4141
return adi_state.caps.nbits;
4242
}
4343

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

4646
#endif /* !(__ASM_SPARC64_ADI_H) */

‎arch/sparc/include/asm/auxio.h‎

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

5-
#ifndef __ASSEMBLY__
5+
#ifndef __ASSEMBLER__
66

77
extern void __iomem *auxio_register;
88

9-
#endif /* ifndef __ASSEMBLY__ */
9+
#endif /* ifndef __ASSEMBLER__ */
1010

1111
#if defined(__sparc__) && defined(__arch64__)
1212
#include <asm/auxio_64.h>

‎arch/sparc/include/asm/auxio_32.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#define AUXIO_FLPY_EJCT 0x02 /* Eject floppy disk. Write only. */
3030
#define AUXIO_LED 0x01 /* On if set, off if unset. Read/Write */
3131

32-
#ifndef __ASSEMBLY__
32+
#ifndef __ASSEMBLER__
3333

3434
/*
3535
* NOTE: these routines are implementation dependent--
@@ -75,7 +75,7 @@ do { \
7575
} \
7676
} while (0)
7777

78-
#endif /* !(__ASSEMBLY__) */
78+
#endif /* !(__ASSEMBLER__) */
7979

8080

8181
/* AUXIO2 (Power Off Control) */

‎arch/sparc/include/asm/auxio_64.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
#define AUXIO_PCIO_CPWR_OFF 0x02 /* Courtesy Power Off */
7575
#define AUXIO_PCIO_SPWR_OFF 0x01 /* System Power Off */
7676

77-
#ifndef __ASSEMBLY__
77+
#ifndef __ASSEMBLER__
7878

7979
#define AUXIO_LTE_ON 1
8080
#define AUXIO_LTE_OFF 0
@@ -94,6 +94,6 @@ void auxio_set_lte(int on);
9494
*/
9595
void auxio_set_led(int on);
9696

97-
#endif /* ifndef __ASSEMBLY__ */
97+
#endif /* ifndef __ASSEMBLER__ */
9898

9999
#endif /* !(_SPARC64_AUXIO_H) */

‎arch/sparc/include/asm/cacheflush_64.h‎

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

55
#include <asm/page.h>
66

7-
#ifndef __ASSEMBLY__
7+
#ifndef __ASSEMBLER__
88

99
#include <linux/mm.h>
1010

@@ -78,6 +78,6 @@ void flush_ptrace_access(struct vm_area_struct *, struct page *,
7878
#define flush_cache_vmap_early(start, end) do { } while (0)
7979
#define flush_cache_vunmap(start, end) do { } while (0)
8080

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

8383
#endif /* _SPARC64_CACHEFLUSH_H */

‎arch/sparc/include/asm/cpudata.h‎

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

5-
#ifndef __ASSEMBLY__
5+
#ifndef __ASSEMBLER__
66

77
#include <linux/threads.h>
88
#include <linux/percpu.h>
99

1010
extern const struct seq_operations cpuinfo_op;
1111

12-
#endif /* !(__ASSEMBLY__) */
12+
#endif /* !(__ASSEMBLER__) */
1313

1414
#if defined(__sparc__) && defined(__arch64__)
1515
#include <asm/cpudata_64.h>

‎arch/sparc/include/asm/cpudata_64.h‎

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

10-
#ifndef __ASSEMBLY__
10+
#ifndef __ASSEMBLER__
1111

1212
typedef struct {
1313
/* Dcache line 1 */
@@ -35,7 +35,7 @@ DECLARE_PER_CPU(cpuinfo_sparc, __cpu_data);
3535
#define cpu_data(__cpu) per_cpu(__cpu_data, (__cpu))
3636
#define local_cpu_data() (*this_cpu_ptr(&__cpu_data))
3737

38-
#endif /* !(__ASSEMBLY__) */
38+
#endif /* !(__ASSEMBLER__) */
3939

4040
#include <asm/trap_block.h>
4141

‎arch/sparc/include/asm/delay_64.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
#ifndef _SPARC64_DELAY_H
88
#define _SPARC64_DELAY_H
99

10-
#ifndef __ASSEMBLY__
10+
#ifndef __ASSEMBLER__
1111

1212
void __delay(unsigned long loops);
1313
void udelay(unsigned long usecs);
1414
#define mdelay(n) udelay((n) * 1000)
1515

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

1818
#endif /* _SPARC64_DELAY_H */

‎arch/sparc/include/asm/elf_64.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
#define R_SPARC_7 43
5959
#define R_SPARC_5 44
6060
#define R_SPARC_6 45
61+
#define R_SPARC_UA64 54
6162

6263
/* Bits present in AT_HWCAP, primarily for Sparc32. */
6364
#define HWCAP_SPARC_FLUSH 0x00000001

‎arch/sparc/include/asm/floppy_64.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <linux/of.h>
1414
#include <linux/of_platform.h>
1515
#include <linux/dma-mapping.h>
16+
#include <linux/string.h>
1617

1718
#include <asm/auxio.h>
1819

@@ -615,7 +616,7 @@ static unsigned long __init sun_floppy_init(void)
615616
sun_pci_fd_ebus_dma.callback = sun_pci_fd_dma_callback;
616617
sun_pci_fd_ebus_dma.client_cookie = NULL;
617618
sun_pci_fd_ebus_dma.irq = FLOPPY_IRQ;
618-
strcpy(sun_pci_fd_ebus_dma.name, "floppy");
619+
strscpy(sun_pci_fd_ebus_dma.name, "floppy");
619620
if (ebus_dma_register(&sun_pci_fd_ebus_dma))
620621
return 0;
621622

0 commit comments

Comments
 (0)