mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
perf, arch: Cleanup perf-pmu init vs lockup-detector
The perf hardware pmu got initialized at various points in the boot, some before early_initcall() some after (notably arch_initcall). The problem is that the NMI lockup detector is ran from early_initcall() and expects the hardware pmu to be present. Sanitize this by moving all architecture hardware pmu implementations to initialize at early_initcall() and move the lockup detector to an explicit initcall right after that. Cc: paulus <[email protected]> Cc: davem <[email protected]> Cc: Michael Cree <[email protected]> Cc: Deng-Cheng Zhu <[email protected]> Acked-by: Paul Mundt <[email protected]> Acked-by: Will Deacon <[email protected]> Signed-off-by: Peter Zijlstra <[email protected]> LKML-Reference: <1290707759.2145.119.camel@laptop> Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
parent
5ef428c4b5
commit
004417a6d4
24 changed files with 38 additions and 42 deletions
|
|
@ -547,13 +547,13 @@ static struct notifier_block __cpuinitdata cpu_nfb = {
|
|||
.notifier_call = cpu_callback
|
||||
};
|
||||
|
||||
static int __init spawn_watchdog_task(void)
|
||||
void __init lockup_detector_init(void)
|
||||
{
|
||||
void *cpu = (void *)(long)smp_processor_id();
|
||||
int err;
|
||||
|
||||
if (no_watchdog)
|
||||
return 0;
|
||||
return;
|
||||
|
||||
err = cpu_callback(&cpu_nfb, CPU_UP_PREPARE, cpu);
|
||||
WARN_ON(notifier_to_errno(err));
|
||||
|
|
@ -561,6 +561,5 @@ static int __init spawn_watchdog_task(void)
|
|||
cpu_callback(&cpu_nfb, CPU_ONLINE, cpu);
|
||||
register_cpu_notifier(&cpu_nfb);
|
||||
|
||||
return 0;
|
||||
return;
|
||||
}
|
||||
early_initcall(spawn_watchdog_task);
|
||||
|
|
|
|||
Loading…
Reference in a new issue