summaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-01-09 15:36:46 -0800
committerDavid S. Miller <davem@davemloft.net>2011-01-09 15:36:46 -0800
commit5edddaab1d5d6143c23fef119a24ea768915681a (patch)
tree6bec94f1037240d9147eae502f671e6e8ccad23a /arch/sparc/kernel
parent0c21e3aaf6ae85bee804a325aa29c325209180fd (diff)
downloadop-kernel-dev-5edddaab1d5d6143c23fef119a24ea768915681a.zip
op-kernel-dev-5edddaab1d5d6143c23fef119a24ea768915681a.tar.gz
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')
-rw-r--r--arch/sparc/kernel/cpu.c2
-rw-r--r--arch/sparc/kernel/pcr.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c
index e447938..0dc714f 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
diff --git a/arch/sparc/kernel/pcr.c b/arch/sparc/kernel/pcr.c
index b87873c..ae96cf5 100644
--- a/arch/sparc/kernel/pcr.c
+++ b/arch/sparc/kernel/pcr.c
@@ -168,4 +168,4 @@ out_unregister:
return err;
}
-arch_initcall(pcr_arch_init);
+early_initcall(pcr_arch_init);
OpenPOWER on IntegriCloud