Commit 7dd894c1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 1c7d0c3a a3da1538

arch/sparc/include/asm/floppy_64.h

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

}

arch/sparc/include/asm/oplib_64.h

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

arch/sparc/include/asm/uaccess_32.h

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

arch/sparc/kernel/head_32.S

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

arch/sparc/power/hibernate.c

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