Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Fix bootup regression due to perf init ordering.
This commit is contained in:
commit
fb7b5a9569
@ -375,5 +375,5 @@ static int __init cpu_type_probe(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
arch_initcall(cpu_type_probe);
|
||||
early_initcall(cpu_type_probe);
|
||||
#endif
|
||||
|
@ -168,4 +168,4 @@ out_unregister:
|
||||
return err;
|
||||
}
|
||||
|
||||
arch_initcall(pcr_arch_init);
|
||||
early_initcall(pcr_arch_init);
|
||||
|
Loading…
Reference in New Issue
Block a user