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

Merge tag 'mips-fixes_6.1_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS fixes from Thomas Bogendoerfer:

 - fix jump label branch range check

 - check kmalloc failures in Loongson64 kexec

 - fix builds with clang-14

 - fix char/int handling in pic32

* tag 'mips-fixes_6.1_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: pic32: treat port as signed integer
  MIPS: jump_label: Fix compat branch range check
  mips: alchemy: gpio: Include the right header
  MIPS: Loongson64: Add WARN_ON on kexec related kmalloc failed
  MIPS: fix duplicate definitions for exported symbols
  mips: boot/compressed: use __NO_FORTIFY
parents ab57bc6f 64806090

arch/mips/alchemy/common/gpiolib.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/gpio.h>

#include <linux/gpio/driver.h>

#include <asm/mach-au1x00/gpio-au1000.h>

#include <asm/mach-au1x00/gpio-au1300.h>

arch/mips/boot/compressed/decompress.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#define DISABLE_BRANCH_PROFILING



#define __NO_FORTIFY

#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/string.h>

arch/mips/include/asm/fw/fw.h

+1 −1
Original line number Diff line number Diff line
@@ -26,6 +26,6 @@ extern char *fw_getcmdline(void); 
extern void fw_meminit(void);

extern char *fw_getenv(char *name);

extern unsigned long fw_getenvl(char *name);

extern void fw_init_early_console(char port);

extern void fw_init_early_console(void);



#endif /* __ASM_FW_H_ */

arch/mips/kernel/jump_label.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ void arch_jump_label_transform(struct jump_entry *e, 
			 * The branch offset must fit in the instruction's 26

			 * bit field.

			 */

			WARN_ON((offset >= BIT(25)) ||

			WARN_ON((offset >= (long)BIT(25)) ||

				(offset < -(long)BIT(25)));



			insn.j_format.opcode = bc6_op;

arch/mips/kernel/relocate_kernel.S

+5 −10
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ LEAF(kexec_smp_wait) 
 * kexec_args[0..3] are used to prepare register values.

 */



kexec_args:

EXPORT(kexec_args)

arg0:	PTR_WD		0x0

arg1:	PTR_WD		0x0
@@ -159,7 +158,6 @@ arg3: PTR_WD 0x0 
 * their registers a0-a3. secondary_kexec_args[0..3] are used

 * to prepare register values.

 */

secondary_kexec_args:

EXPORT(secondary_kexec_args)

s_arg0: PTR_WD		0x0

s_arg1: PTR_WD		0x0
@@ -171,19 +169,16 @@ kexec_flag: 


#endif



kexec_start_address:

EXPORT(kexec_start_address)

	PTR_WD		0x0

	.size		kexec_start_address, PTRSIZE



kexec_indirection_page:

EXPORT(kexec_indirection_page)

	PTR_WD		0

	.size		kexec_indirection_page, PTRSIZE



relocate_new_kernel_end:



relocate_new_kernel_size:

EXPORT(relocate_new_kernel_size)

	PTR_WD		relocate_new_kernel_end - relocate_new_kernel

	.size		relocate_new_kernel_size, PTRSIZE