commit fb7b5a956992fdc53d0b9c8ea29b51b92839dc1b · tjh.dev/kernel

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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.

+2 -2

2 changed files

expand all

arch

sparc

kernel

cpu.c

pcr.c

+1 -1

arch/sparc/kernel/cpu.c

··· 375 return 0; 376 } 377 378 - arch_initcall(cpu_type_probe); 379 #endif

··· 375 return 0; 376 } 377 378 + early_initcall(cpu_type_probe); 379 #endif

+1 -1

arch/sparc/kernel/pcr.c

··· 168 return err; 169 } 170 171 - arch_initcall(pcr_arch_init);

··· 168 return err; 169 } 170 171 + early_initcall(pcr_arch_init);