Commit b02afe1d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xtensa-20230928' of https://github.com/jcmvbkbc/linux-xtensa 

Pull Xtensa fixes from Max Filippov:

 - fix build warnings from builds performed with W=1

* tag 'xtensa-20230928' of https://github.com/jcmvbkbc/linux-xtensa:
  xtensa: boot/lib: fix function prototypes
  xtensa: umulsidi3: fix conditional expression
  xtensa: boot: don't add include-dirs
  xtensa: iss/network: make functions static
  xtensa: tlb: include <asm/tlb.h> for missing prototype
  xtensa: hw_breakpoint: include header for missing prototype
  xtensa: smp: add headers for missing function prototypes
  irqchip: irq-xtensa-mx: include header for missing prototype
  xtensa: traps: add <linux/cpu.h> for function prototype
  xtensa: stacktrace: include <asm/ftrace.h> for prototype
  xtensa: signal: include headers for function prototypes
  xtensa: processor.h: add init_arch() prototype
  xtensa: ptrace: add prototypes to <asm/ptrace.h>
  xtensa: irq: include <asm/traps.h>
  xtensa: fault: include <asm/traps.h>
  xtensa: add default definition for XCHAL_HAVE_DIV32
parents 9ed22ae6 f54d02c8

arch/xtensa/boot/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ 




# KBUILD_CFLAGS used when building rest of boot (takes effect recursively)

KBUILD_CFLAGS	+= -fno-builtin -Iarch/$(ARCH)/boot/include

HOSTFLAGS	+= -Iarch/$(ARCH)/boot/include

KBUILD_CFLAGS	+= -fno-builtin



subdir-y	:= lib

targets		+= vmlinux.bin vmlinux.bin.gz

arch/xtensa/boot/lib/zmem.c

+3 −2
Original line number Diff line number Diff line
@@ -4,13 +4,14 @@ 
/* bits taken from ppc */



extern void *avail_ram, *end_avail;

void gunzip(void *dst, int dstlen, unsigned char *src, int *lenp);



void exit (void)

static void exit(void)

{

  for (;;);

}



void *zalloc(unsigned size)

static void *zalloc(unsigned int size)

{

        void *p = avail_ram;

arch/xtensa/include/asm/core.h

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ 


#include <variant/core.h>



#ifndef XCHAL_HAVE_DIV32

#define XCHAL_HAVE_DIV32 0

#endif



#ifndef XCHAL_HAVE_EXCLUSIVE

#define XCHAL_HAVE_EXCLUSIVE 0

#endif

arch/xtensa/include/asm/hw_breakpoint.h

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ void arch_uninstall_hw_breakpoint(struct perf_event *bp); 
void hw_breakpoint_pmu_read(struct perf_event *bp);

int check_hw_breakpoint(struct pt_regs *regs);

void clear_ptrace_hw_breakpoint(struct task_struct *tsk);

void restore_dbreak(void);



#else

arch/xtensa/include/asm/processor.h

+5 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 


#include <linux/compiler.h>

#include <linux/stringify.h>



#include <asm/bootparam.h>

#include <asm/ptrace.h>

#include <asm/types.h>

#include <asm/regs.h>
@@ -217,6 +219,9 @@ struct mm_struct; 


extern unsigned long __get_wchan(struct task_struct *p);



void init_arch(bp_tag_t *bp_start);

void do_notify_resume(struct pt_regs *regs);



#define KSTK_EIP(tsk)		(task_pt_regs(tsk)->pc)

#define KSTK_ESP(tsk)		(task_pt_regs(tsk)->areg[1])