- fixed function/preempt traces hangs

- a few build fixes
 -----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCAA4FiEEbt46xwy6kEcDOXoUeZbBVTGwZHAFAmCw2McaHHRzYm9nZW5k
 QGFscGhhLmZyYW5rZW4uZGUACgkQeZbBVTGwZHChmg//WYL4LeyHJd7UjA4YplgP
 J+DKFm3AlcbugD0kUm8MhiX1Dt9L1oM+NTrm+/uyHi5Vsp8ReV2h+iUudLwoE8tD
 MP4IarvoOXFj1VmRQkFOfJbHq+An7k9kNBcq16DIfUtD07GRFzCgVyQix1/osRzg
 vg7FP/UOMwI9DAkN67CieWk75mmzzcC3xDaoTC1dcTG2tuUxwXzmw2JcskzLfbGk
 66Er9O476v6JxQu24GL3Ls15L426YLhAQ5vS4vBrHRXRgtjpr2B4ZE95jZrUQdbQ
 omsTDFNeViTOQgLeF1b/eCU6cZqbOLOUd9GVWVfgsEZCk8qXu14jCWCohVPri9w1
 NYzmOhyvvxpMzL0/rKoljBV01eJXrA66v/abUwDhbBhAt5qowjIK0OmRcDVFVrHX
 XA/xM0R//BxdR4idXtp/kVIOxfRgUIYptcqFICMlvaHIeGvtt8vVL4SZVMHXNwYK
 L5hiIH5z8Sc1MxLPYuCxqveDHKdm8wPRqEEgThT7UNjEgLBPtvarRj0mQ9PQe4xr
 8YVPkSeaZNRsRuSKNBCYopo+iqbipyR34lTTc/IfJULaGE6CB9PAk6qyf5GIFycZ
 3HK8SLec5hI4dfPZ0y40xVZLNBMFKcCI4hKUJV+o/t0btNP1xgBCQkdAFJ6o34iu
 eYare6N46pJOzHHN/nlEaew=
 =c2eW
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2021-05-28 08:24:13 -10:00
commit afdd14704d
4 changed files with 14 additions and 6 deletions

View file

@ -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)

View file

@ -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 */

View file

@ -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);

View file

@ -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)
{