diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-01 13:29:55 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-01 13:29:55 -0500 |
| commit | 0dbd888936a23514716b8d944775bc56f731363a (patch) | |
| tree | a2c60cdc45bdcbed47680731fa8188bffe58c098 /arch/sparc64/kernel/smp.c | |
| parent | 0b442d2c28479332610c46e1a74e5638ab63a97d (diff) | |
| parent | d395991c117d43bfca97101a931a41d062a93852 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/sparc64/kernel/smp.c')
| -rw-r--r-- | arch/sparc64/kernel/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c index a8052b76df41..cc454731d879 100644 --- a/arch/sparc64/kernel/smp.c +++ b/arch/sparc64/kernel/smp.c | |||
| @@ -86,7 +86,7 @@ extern void setup_sparc64_timer(void); | |||
| 86 | 86 | ||
| 87 | static volatile unsigned long callin_flag = 0; | 87 | static volatile unsigned long callin_flag = 0; |
| 88 | 88 | ||
| 89 | void __devinit smp_callin(void) | 89 | void __cpuinit smp_callin(void) |
| 90 | { | 90 | { |
| 91 | int cpuid = hard_smp_processor_id(); | 91 | int cpuid = hard_smp_processor_id(); |
| 92 | 92 | ||