Skip to content

Commit 5edddaa

Browse files
committed
sparc64: Fix bootup regression due to perf init ordering.
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 0c21e3a commit 5edddaa

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/sparc/kernel/cpu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,5 +375,5 @@ static int __init cpu_type_probe(void)
375375
return 0;
376376
}
377377

378-
arch_initcall(cpu_type_probe);
378+
early_initcall(cpu_type_probe);
379379
#endif

arch/sparc/kernel/pcr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,4 +168,4 @@ int __init pcr_arch_init(void)
168168
return err;
169169
}
170170

171-
arch_initcall(pcr_arch_init);
171+
early_initcall(pcr_arch_init);

0 commit comments

Comments
 (0)