Skip to content

Commit

Permalink
Merge tag 'parisc-for-6.5-rc1-2' of git://git.kernel.org/pub/scm/linu…
Browse files Browse the repository at this point in the history
…x/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()
  • Loading branch information
torvalds committed Jul 5, 2023
2 parents 6cd06ab + f8a473b commit 2a95b03
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 7 deletions.
2 changes: 2 additions & 0 deletions arch/parisc/include/asm/processor.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions arch/parisc/kernel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions arch/parisc/kernel/pdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions arch/parisc/kernel/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
5 changes: 3 additions & 2 deletions arch/parisc/kernel/unwind.c
Original file line number Diff line number Diff line change
Expand Up @@ -221,16 +221,17 @@ 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;
extern void * const _switch_to_ret;
#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];
Expand Down
3 changes: 2 additions & 1 deletion arch/parisc/math-emu/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
# See arch/parisc/math-emu/README
ccflags-y := -Wno-parentheses -Wno-implicit-function-declaration \
-Wno-uninitialized -Wno-strict-prototypes -Wno-return-type \
-Wno-implicit-int
-Wno-implicit-int -Wno-missing-prototypes -Wno-missing-declarations \
-Wno-old-style-definition -Wno-unused-but-set-variable

obj-y := frnd.o driver.o decode_exc.o fpudispatch.o denormal.o \
dfmpy.o sfmpy.o sfsqrt.o dfsqrt.o dfadd.o fmpyfadd.o \
Expand Down
4 changes: 2 additions & 2 deletions scripts/min-tool-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ binutils)
echo 2.25.0
;;
gcc)
if [ "$SRCARCH" = parisc ]; then
echo 11.0.0
if [ "$ARCH" = parisc64 ]; then
echo 12.0.0
else
echo 5.1.0
fi
Expand Down

0 comments on commit 2a95b03

Please sign in to comment.