kevin/linux
1
Fork 0
Code

This includes the following changes related to sparc for v6.11:

Browse Source 
- Add MODULE_DESCRIPTION for a number of sbus drivers
 
 - Fix linking error for large sparc32 kernels
 
 - Fix incorrect functions signature and prototype warnings for sparc64
 -----BEGIN PGP SIGNATURE-----
 
 iIoEABYIADIWIQQfqfbgobF48oKMeq81AykqDLayywUCZpjDYRQcYW5kcmVhc0Bn
 YWlzbGVyLmNvbQAKCRA1AykqDLayy7+vAP45h4TU0KyThlVXpmknK3xnIzaQr86y
 leL6kJXwuSDQvAD8DpyasoLS43ryB1NV2RpNUWVHlwmdQ3f9CNleHinkJgA=
 =tdDX
 -----END PGP SIGNATURE-----

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

Pull sparc updates from Andreas Larsson:

 - Add MODULE_DESCRIPTION for a number of sbus drivers

 - Fix linking error for large sparc32 kernels

 - Fix incorrect functions signature and prototype warnings for sparc64

* tag 'sparc-for-6.11-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc:
  sparc64: Fix prototype warnings in hibernate.c
  sparc64: Fix prototype warning for prom_get_mmu_ihandle
  sparc64: Fix incorrect function signature and add prototype for prom_cif_init
  sparc64: Fix prototype warnings for floppy_64.h
  sparc32: Fix truncated relocation errors when linking large kernels
  sbus: add missing MODULE_DESCRIPTION() macros
This commit is contained in:
Linus Torvalds 2024-07-18 15:48:41 -07:00
commit 7dd894c1bf
12 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/sparc/include/asm/floppy_64.h
View File

@ -197,7 +197,7 @@ static void sun_fd_enable_dma(void)
pdma_areasize = pdma_size;
}
irqreturn_t sparc_floppy_irq(int irq, void *dev_cookie)
static irqreturn_t sparc_floppy_irq(int irq, void *dev_cookie)
{
if (likely(doing_pdma)) {
void __iomem *stat = (void __iomem *) fdc_status;
@ -434,7 +434,8 @@ static int sun_pci_fd_eject(int drive)
return -EINVAL;
}
void sun_pci_fd_dma_callback(struct ebus_dma_info *p, int event, void *cookie)
static void sun_pci_fd_dma_callback(struct ebus_dma_info *p, int event,
void *cookie)
{
floppy_interrupt(0, NULL);
}

1
arch/sparc/include/asm/oplib_64.h
View File

@ -247,6 +247,7 @@ void prom_sun4v_guest_soft_state(void);
int prom_ihandle2path(int handle, char *buffer, int bufsize);
/* Client interface level routines. */
void prom_cif_init(void *cif_handler);
void p1275_cmd_direct(unsigned long *);
#endif /* !(__SPARC64_OPLIB_H) */

6
arch/sparc/include/asm/uaccess_32.h
View File

@ -95,7 +95,8 @@ __asm__ __volatile__( \
".section .fixup,#alloc,#execinstr\n\t" \
".align 4\n" \
"3:\n\t" \
"b 2b\n\t" \
"sethi %%hi(2b), %0\n\t" \
"jmpl %0 + %%lo(2b), %%g0\n\t" \
" mov %3, %0\n\t" \
".previous\n\n\t" \
".section __ex_table,#alloc\n\t" \
@ -163,8 +164,9 @@ __asm__ __volatile__( \
".section .fixup,#alloc,#execinstr\n\t" \
".align 4\n" \
"3:\n\t" \
"sethi %%hi(2b), %0\n\t" \
"clr %1\n\t" \
"b 2b\n\t" \
"jmpl %0 + %%lo(2b), %%g0\n\t" \
" mov %3, %0\n\n\t" \
".previous\n\t" \
".section __ex_table,#alloc\n\t" \

15
arch/sparc/kernel/head_32.S
View File

@ -118,9 +118,12 @@ current_pc:
mov %o7, %g3
tst %o0
be no_sun4u_here
bne 2f
mov %g4, %o7 /* Previous %o7. */
sethi %hi(no_sun4u_here), %l1
jmpl %l1 + %lo(no_sun4u_here), %g0
nop
2:
mov %o0, %l0 ! stash away romvec
mov %o0, %g7 ! put it here too
mov %o1, %l1 ! stash away debug_vec too
@ -195,7 +198,8 @@ halt_notsup:
sub %o0, %l6, %o0
call %o1
nop
ba halt_me
sethi %hi(halt_me), %o0
jmpl %o0 + %lo(halt_me), %g0
nop
not_a_sun4:
@ -431,8 +435,11 @@ leon_init:
#ifdef CONFIG_SMP
ldub [%g2 + %lo(boot_cpu_id)], %g1
cmp %g1, 0xff ! unset means first CPU
bne leon_smp_cpu_startup ! continue only with master
be 1f
sethi %hi(leon_smp_cpu_startup), %g1
jmpl %g1 + %lo(leon_smp_cpu_startup), %g0
nop
1:
#endif
/* Get CPU-ID from most significant 4-bit of ASR17 */
rd %asr17, %g1

1
arch/sparc/power/hibernate.c
View File

@ -5,6 +5,7 @@
* Copyright (C) 2013 Kirill V Tkhai (tkhai@yandex.ru)
*/
#include <linux/suspend.h>
#include <linux/mm.h>
#include <asm/hibernate.h>

3
arch/sparc/prom/init_64.c
View File

@ -26,9 +26,6 @@ phandle prom_chosen_node;
* routines in the prom library.
* It gets passed the pointer to the PROM vector.
*/
extern void prom_cif_init(void *);
void __init prom_init(void *cif_handler)
{
phandle node;

2
arch/sparc/prom/misc_64.c
View File

@ -162,7 +162,7 @@ unsigned char prom_get_idprom(char *idbuf, int num_bytes)
return 0xff;
}
int prom_get_mmu_ihandle(void)
static int prom_get_mmu_ihandle(void)
{
phandle node;
int ret;

2
arch/sparc/prom/p1275.c
View File

@ -49,7 +49,7 @@ void p1275_cmd_direct(unsigned long *args)
local_irq_restore(flags);
}
void prom_cif_init(void *cif_handler, void *cif_stack)
void prom_cif_init(void *cif_handler)
{
p1275buf.prom_cif_handler = (void (*)(long *))cif_handler;
}

1
drivers/sbus/char/bbc_i2c.c
View File

@ -418,4 +418,5 @@ static struct platform_driver bbc_i2c_driver = {
module_platform_driver(bbc_i2c_driver);
MODULE_DESCRIPTION("UltraSPARC-III bootbus i2c controller driver");
MODULE_LICENSE("GPL");

1
drivers/sbus/char/envctrl.c
View File

@ -1130,4 +1130,5 @@ static struct platform_driver envctrl_driver = {
module_platform_driver(envctrl_driver);
MODULE_DESCRIPTION("SUN environment monitoring device driver");
MODULE_LICENSE("GPL");

1
drivers/sbus/char/flash.c
View File

@ -211,4 +211,5 @@ static struct platform_driver flash_driver = {
module_platform_driver(flash_driver);
MODULE_DESCRIPTION("OBP Flash Device driver");
MODULE_LICENSE("GPL");

1
drivers/sbus/char/uctrl.c
View File

@ -431,4 +431,5 @@ static struct platform_driver uctrl_driver = {
module_platform_driver(uctrl_driver);
MODULE_DESCRIPTION("Tadpole TS102 Microcontroller driver");
MODULE_LICENSE("GPL");