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

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

Pull MIPS fixes from Thomas Bogendoerfer:

 - fix function/preempt trace hangs

 - a few build fixes

* tag 'mips-fixes_5.13_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: Fix kernel hang under FUNCTION_GRAPH_TRACER and PREEMPT_TRACER
  MIPS: ralink: export rt_sysc_membase for rt2880_wdt.c
  MIPS: launch.h: add include guard to prevent build errors
  MIPS: alchemy: xxs1500: add gpio-au1000.h header file
parents 97e5bf60 78cf0eb9

arch/mips/alchemy/board-xxs1500.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <asm/reboot.h>

#include <asm/setup.h>

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

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

#include <prom.h>



const char *get_system_type(void)

arch/mips/include/asm/mips-boards/launch.h

+5 −0
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ 
 *

 */



#ifndef _ASM_MIPS_BOARDS_LAUNCH_H

#define _ASM_MIPS_BOARDS_LAUNCH_H



#ifndef _ASSEMBLER_



struct cpulaunch {
@@ -34,3 +37,5 @@ struct cpulaunch { 


/* Polling period in count cycles for secondary CPU's */

#define LAUNCHPERIOD	10000



#endif /* _ASM_MIPS_BOARDS_LAUNCH_H */

arch/mips/lib/mips-atomic.c

+6 −6
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
 */

notrace void arch_local_irq_disable(void)

{

	preempt_disable();

	preempt_disable_notrace();



	__asm__ __volatile__(

	"	.set	push						\n"
@@ -53,7 +53,7 @@ notrace void arch_local_irq_disable(void) 
	: /* no inputs */

	: "memory");



	preempt_enable();

	preempt_enable_notrace();

}

EXPORT_SYMBOL(arch_local_irq_disable);
@@ -61,7 +61,7 @@ notrace unsigned long arch_local_irq_save(void) 
{

	unsigned long flags;



	preempt_disable();

	preempt_disable_notrace();



	__asm__ __volatile__(

	"	.set	push						\n"
@@ -78,7 +78,7 @@ notrace unsigned long arch_local_irq_save(void) 
	: /* no inputs */

	: "memory");



	preempt_enable();

	preempt_enable_notrace();



	return flags;

}
@@ -88,7 +88,7 @@ notrace void arch_local_irq_restore(unsigned long flags) 
{

	unsigned long __tmp1;



	preempt_disable();

	preempt_disable_notrace();



	__asm__ __volatile__(

	"	.set	push						\n"
@@ -106,7 +106,7 @@ notrace void arch_local_irq_restore(unsigned long flags) 
	: "0" (flags)

	: "memory");



	preempt_enable();

	preempt_enable_notrace();

}

EXPORT_SYMBOL(arch_local_irq_restore);

arch/mips/ralink/of.c

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include <linux/io.h>

#include <linux/clk.h>

#include <linux/export.h>

#include <linux/init.h>

#include <linux/sizes.h>

#include <linux/of_fdt.h>
@@ -25,6 +26,7 @@ 


__iomem void *rt_sysc_membase;

__iomem void *rt_memc_membase;

EXPORT_SYMBOL_GPL(rt_sysc_membase);



__iomem void *plat_of_remap_node(const char *node)

{