Commit 2a95b03d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'parisc-for-6.5-rc1-2' of... 

Merge tag 'parisc-for-6.5-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull more parisc architecture updates from Helge Deller:

 -  Fix all compiler warnings in arch/parisc and drivers/parisc when
    compiled with W=1

* tag 'parisc-for-6.5-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: syscalls: Avoid compiler warnings with W=1
  parisc: math-emu: Avoid compiler warnings with W=1
  parisc: Raise minimal GCC version to 12.0.0
  parisc: unwind: Avoid missing prototype warning for handle_interruption()
  parisc: smp: Add declaration for start_cpu_itimer()
  parisc: pdt: Get prototype for arch_report_meminfo()
parents 6cd06ab1 f8a473bf

arch/parisc/include/asm/processor.h

+2 −0
Original line number Diff line number Diff line
@@ -295,6 +295,8 @@ extern unsigned int toc_handler_csum; 
extern void do_cpu_irq_mask(struct pt_regs *);

extern irqreturn_t timer_interrupt(int, void *);

extern irqreturn_t ipi_interrupt(int, void *);

extern void start_cpu_itimer(void);

extern void handle_interruption(int, struct pt_regs *);



/* called from assembly code: */

extern void start_parisc(void);

arch/parisc/kernel/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ CFLAGS_REMOVE_unwind.o = $(CC_FLAGS_FTRACE) 
CFLAGS_REMOVE_patch.o = $(CC_FLAGS_FTRACE)

endif



CFLAGS_REMOVE_sys_parisc.o = -Wmissing-prototypes -Wmissing-declarations

CFLAGS_REMOVE_sys_parisc32.o = -Wmissing-prototypes -Wmissing-declarations



obj-$(CONFIG_SMP)	+= smp.o

obj-$(CONFIG_PA11)	+= pci-dma.o

obj-$(CONFIG_PCI)	+= pci.o

arch/parisc/kernel/pdt.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/memblock.h>

#include <linux/seq_file.h>

#include <linux/kthread.h>

#include <linux/proc_fs.h>

#include <linux/initrd.h>

#include <linux/pgtable.h>

#include <linux/mm.h>

arch/parisc/kernel/smp.c

+0 −2
Original line number Diff line number Diff line
@@ -271,8 +271,6 @@ void arch_send_call_function_single_ipi(int cpu) 
static void

smp_cpu_init(int cpunum)

{

	extern void start_cpu_itimer(void); /* arch/parisc/kernel/time.c */



	/* Set modes and Enable floating point coprocessor */

	init_per_cpu(cpunum);

arch/parisc/kernel/unwind.c

+3 −2
Original line number Diff line number Diff line
@@ -221,7 +221,6 @@ static int unwind_special(struct unwind_frame_info *info, unsigned long pc, int 
	 * Note: We could use dereference_kernel_function_descriptor()

	 * instead but we want to keep it simple here.

	 */

	extern void * const handle_interruption;

	extern void * const ret_from_kernel_thread;

	extern void * const syscall_exit;

	extern void * const intr_return;
@@ -229,8 +228,10 @@ static int unwind_special(struct unwind_frame_info *info, unsigned long pc, int 
#ifdef CONFIG_IRQSTACKS

	extern void * const _call_on_stack;

#endif /* CONFIG_IRQSTACKS */

	void *ptr;



	if (pc_is_kernel_fn(pc, handle_interruption)) {

	ptr = dereference_kernel_function_descriptor(&handle_interruption);

	if (pc_is_kernel_fn(pc, ptr)) {

		struct pt_regs *regs = (struct pt_regs *)(info->sp - frame_size - PT_SZ_ALGN);

		dbg("Unwinding through handle_interruption()\n");

		info->prev_sp = regs->gr[30];