Skip to content

Commit

Permalink
sparc64: Fix bootup regression due to perf init ordering.
Browse files Browse the repository at this point in the history
Commit 004417a
("perf, arch: Cleanup perf-pmu init vs lockup-detector")
move the perf events init to be an early_initcall.

But this won't work properly unless the dependencies for
this code initialize beforehand.

Fix it by making cpu_type_probe and pcr_arch_init be
an early_initcall as well.

Reported-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Jan 9, 2011
1 parent 0c21e3a commit 5edddaa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/sparc/kernel/cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -375,5 +375,5 @@ static int __init cpu_type_probe(void)
return 0;
}

arch_initcall(cpu_type_probe);
early_initcall(cpu_type_probe);
#endif
2 changes: 1 addition & 1 deletion arch/sparc/kernel/pcr.c
Original file line number Diff line number Diff line change
Expand Up @@ -168,4 +168,4 @@ int __init pcr_arch_init(void)
return err;
}

arch_initcall(pcr_arch_init);
early_initcall(pcr_arch_init);

0 comments on commit 5edddaa

Please sign in to comment.