Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb7b5a95 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 5a62f995 5edddaab

arch/sparc/kernel/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -375,5 +375,5 @@ static int __init cpu_type_probe(void) 
	return 0;

}



arch_initcall(cpu_type_probe);

early_initcall(cpu_type_probe);

#endif

arch/sparc/kernel/pcr.c

+1 −1
Original line number Diff line number Diff line
@@ -168,4 +168,4 @@ int __init pcr_arch_init(void) 
	return err;

}



arch_initcall(pcr_arch_init);
 
early_initcall(pcr_arch_init);