diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-10 00:36:46 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-10 00:36:46 +0100 |
| commit | 5edddaab1d5d6143c23fef119a24ea768915681a (patch) | |
| tree | 6bec94f1037240d9147eae502f671e6e8ccad23a /arch/sparc/kernel/cpu.c | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/... (diff) | |
| download | linux-5edddaab1d5d6143c23fef119a24ea768915681a.tar.xz linux-5edddaab1d5d6143c23fef119a24ea768915681a.zip | |
sparc64: Fix bootup regression due to perf init ordering.
Commit 004417a6d468e24399e383645c068b498eed84ad
("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>
Diffstat (limited to 'arch/sparc/kernel/cpu.c')
| -rw-r--r-- | arch/sparc/kernel/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c index e447938d39cf..0dc714fa23d8 100644 --- a/arch/sparc/kernel/cpu.c +++ b/arch/sparc/kernel/cpu.c @@ -375,5 +375,5 @@ static int __init cpu_type_probe(void) return 0; } -arch_initcall(cpu_type_probe); +early_initcall(cpu_type_probe); #endif |