sparc64: Fix NMI startup bug which also breaks perf.
Doing NMI startup as an early initcall doesn't work because we need to have SMP started up by then. So we'd only NMI startup one cpu, which causes perf PMU grab to BUG because the nmi_active count isn't what it's supposed to be. This also points out that we don't have proper CPU up/down notifiers for the NMI code which will need to be fixed at some point. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
711c71a092
commit
b62818e5ff
@ -43,4 +43,6 @@ static inline u64 picl_value(unsigned int nmi_hz)
|
||||
|
||||
extern u64 pcr_enable;
|
||||
|
||||
extern int pcr_arch_init(void);
|
||||
|
||||
#endif /* __PCR_H */
|
||||
|
@ -167,5 +167,3 @@ out_unregister:
|
||||
unregister_perf_hsvc();
|
||||
return err;
|
||||
}
|
||||
|
||||
early_initcall(pcr_arch_init);
|
||||
|
@ -49,6 +49,7 @@
|
||||
#include <asm/mdesc.h>
|
||||
#include <asm/ldc.h>
|
||||
#include <asm/hypervisor.h>
|
||||
#include <asm/pcr.h>
|
||||
|
||||
#include "cpumap.h"
|
||||
|
||||
@ -1358,6 +1359,7 @@ void __cpu_die(unsigned int cpu)
|
||||
|
||||
void __init smp_cpus_done(unsigned int max_cpus)
|
||||
{
|
||||
pcr_arch_init();
|
||||
}
|
||||
|
||||
void smp_send_reschedule(int cpu)
|
||||
|
Loading…
Reference in New Issue
Block a user