diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-11 19:32:20 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-11 19:32:20 -0500 |
| commit | fb7b5a956992fdc53d0b9c8ea29b51b92839dc1b (patch) | |
| tree | c54022cad761358de7488d7a46bab2fa2139343f /arch/sparc | |
| parent | 5a62f995446be44811fefa48f91f9efb7ea172d7 (diff) | |
| parent | 5edddaab1d5d6143c23fef119a24ea768915681a (diff) | |
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.
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/cpu.c | 2 | ||||
| -rw-r--r-- | arch/sparc/kernel/pcr.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c index e447938d39c..0dc714fa23d 100644 --- a/arch/sparc/kernel/cpu.c +++ b/arch/sparc/kernel/cpu.c | |||
| @@ -375,5 +375,5 @@ static int __init cpu_type_probe(void) | |||
| 375 | return 0; | 375 | return 0; |
| 376 | } | 376 | } |
| 377 | 377 | ||
| 378 | arch_initcall(cpu_type_probe); | 378 | early_initcall(cpu_type_probe); |
| 379 | #endif | 379 | #endif |
diff --git a/arch/sparc/kernel/pcr.c b/arch/sparc/kernel/pcr.c index b87873c0e8e..ae96cf52a95 100644 --- a/arch/sparc/kernel/pcr.c +++ b/arch/sparc/kernel/pcr.c | |||
| @@ -168,4 +168,4 @@ out_unregister: | |||
| 168 | return err; | 168 | return err; |
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | arch_initcall(pcr_arch_init); | 171 | early_initcall(pcr_arch_init); |