UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Linus Torvalds 2011-01-11 16:32:20 -08:00
parent 5a62f99544 5edddaab1d
commit fb7b5a9569
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sparc/kernel/cpu.c
View File

@ -375,5 +375,5 @@ static int __init cpu_type_probe(void)
return 0; return 0;
} }
arch_initcall(cpu_type_probe); early_initcall(cpu_type_probe);
#endif #endif

2
arch/sparc/kernel/pcr.c
View File

@ -168,4 +168,4 @@ out_unregister:
return err; return err;
} }
arch_initcall(pcr_arch_init); early_initcall(pcr_arch_init);