Skip to content

Commit 2a95b03

Browse files
committed
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()
2 parents 6cd06ab + f8a473b commit 2a95b03

File tree

7 files changed

+13
-7
lines changed

7 files changed

+13
-7
lines changed

arch/parisc/include/asm/processor.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,8 @@ extern unsigned int toc_handler_csum;
295295
extern void do_cpu_irq_mask(struct pt_regs *);
296296
extern irqreturn_t timer_interrupt(int, void *);
297297
extern irqreturn_t ipi_interrupt(int, void *);
298+
extern void start_cpu_itimer(void);
299+
extern void handle_interruption(int, struct pt_regs *);
298300

299301
/* called from assembly code: */
300302
extern void start_parisc(void);

arch/parisc/kernel/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ CFLAGS_REMOVE_unwind.o = $(CC_FLAGS_FTRACE)
2121
CFLAGS_REMOVE_patch.o = $(CC_FLAGS_FTRACE)
2222
endif
2323

24+
CFLAGS_REMOVE_sys_parisc.o = -Wmissing-prototypes -Wmissing-declarations
25+
CFLAGS_REMOVE_sys_parisc32.o = -Wmissing-prototypes -Wmissing-declarations
26+
2427
obj-$(CONFIG_SMP) += smp.o
2528
obj-$(CONFIG_PA11) += pci-dma.o
2629
obj-$(CONFIG_PCI) += pci.o

arch/parisc/kernel/pdt.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <linux/memblock.h>
1717
#include <linux/seq_file.h>
1818
#include <linux/kthread.h>
19+
#include <linux/proc_fs.h>
1920
#include <linux/initrd.h>
2021
#include <linux/pgtable.h>
2122
#include <linux/mm.h>

arch/parisc/kernel/smp.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,6 @@ void arch_send_call_function_single_ipi(int cpu)
271271
static void
272272
smp_cpu_init(int cpunum)
273273
{
274-
extern void start_cpu_itimer(void); /* arch/parisc/kernel/time.c */
275-
276274
/* Set modes and Enable floating point coprocessor */
277275
init_per_cpu(cpunum);
278276

arch/parisc/kernel/unwind.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,16 +221,17 @@ static int unwind_special(struct unwind_frame_info *info, unsigned long pc, int
221221
* Note: We could use dereference_kernel_function_descriptor()
222222
* instead but we want to keep it simple here.
223223
*/
224-
extern void * const handle_interruption;
225224
extern void * const ret_from_kernel_thread;
226225
extern void * const syscall_exit;
227226
extern void * const intr_return;
228227
extern void * const _switch_to_ret;
229228
#ifdef CONFIG_IRQSTACKS
230229
extern void * const _call_on_stack;
231230
#endif /* CONFIG_IRQSTACKS */
231+
void *ptr;
232232

233-
if (pc_is_kernel_fn(pc, handle_interruption)) {
233+
ptr = dereference_kernel_function_descriptor(&handle_interruption);
234+
if (pc_is_kernel_fn(pc, ptr)) {
234235
struct pt_regs *regs = (struct pt_regs *)(info->sp - frame_size - PT_SZ_ALGN);
235236
dbg("Unwinding through handle_interruption()\n");
236237
info->prev_sp = regs->gr[30];

arch/parisc/math-emu/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
# See arch/parisc/math-emu/README
77
ccflags-y := -Wno-parentheses -Wno-implicit-function-declaration \
88
-Wno-uninitialized -Wno-strict-prototypes -Wno-return-type \
9-
-Wno-implicit-int
9+
-Wno-implicit-int -Wno-missing-prototypes -Wno-missing-declarations \
10+
-Wno-old-style-definition -Wno-unused-but-set-variable
1011

1112
obj-y := frnd.o driver.o decode_exc.o fpudispatch.o denormal.o \
1213
dfmpy.o sfmpy.o sfsqrt.o dfsqrt.o dfadd.o fmpyfadd.o \

scripts/min-tool-version.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ binutils)
1717
echo 2.25.0
1818
;;
1919
gcc)
20-
if [ "$SRCARCH" = parisc ]; then
21-
echo 11.0.0
20+
if [ "$ARCH" = parisc64 ]; then
21+
echo 12.0.0
2222
else
2323
echo 5.1.0
2424
fi

0 commit comments

Comments
 (0)