Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

torvalds · torvalds · commit fb7b5a956992 · 2011-01-11T16:32:20.000-08:00
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Fix bootup regression due to perf init ordering.
diff --git 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
@@ -168,4 +168,4 @@ int __init pcr_arch_init(void)
 	return err;
 }
 
-arch_initcall(pcr_arch_init);
+early_initcall(pcr_arch_init);

Original file line number	Diff line number	Diff line change
`@@ -375,5 +375,5 @@ static int __init cpu_type_probe(void)`
`375`	`375`	`return 0;`
`376`	`376`	`}`
`377`	`377`
`378`		`-arch_initcall(cpu_type_probe);`
	`378`	`+early_initcall(cpu_type_probe);`
`379`	`379`	`#endif`