diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-08 13:52:00 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-08 13:52:00 +0100 |
commit | 4d117c5c6b00254e51c61ff5b506ccaba21a5a03 (patch) | |
tree | ecb9d3ee4bfd9610c459c1eb0c0357c2905f3ae4 /arch/sparc/kernel/cpu.c | |
parent | 6c415b9234a8c71f290e5d4fddc467f103f32719 (diff) | |
parent | 43714539eab42b2fa3653ea7bd667b36c2291b11 (diff) | |
download | kernel_samsung_aries-4d117c5c6b00254e51c61ff5b506ccaba21a5a03.zip kernel_samsung_aries-4d117c5c6b00254e51c61ff5b506ccaba21a5a03.tar.gz kernel_samsung_aries-4d117c5c6b00254e51c61ff5b506ccaba21a5a03.tar.bz2 |
Merge branch 'sched/urgent' into sched/core
Diffstat (limited to 'arch/sparc/kernel/cpu.c')
-rw-r--r-- | arch/sparc/kernel/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c index e7a0edf..1fc17f5 100644 --- a/arch/sparc/kernel/cpu.c +++ b/arch/sparc/kernel/cpu.c @@ -126,7 +126,7 @@ char *sparc_fpu_type; unsigned int fsr_storage; -void __init cpu_probe(void) +void __cpuinit cpu_probe(void) { int psr_impl, psr_vers, fpu_vers; int i, psr; |