diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-20 23:05:45 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-20 23:05:45 -0500 |
| commit | 6bd25e78211d0591060db3ece10443096ef96c50 (patch) | |
| tree | 95262e041c1451c8672cfcc580fc1e0e112a2603 /arch/powerpc/platforms | |
| parent | 35e622a67e6d2c5f7e3d3e2da92ebdb2f46db783 (diff) | |
| parent | 496b7a5159b8366b003bbc17f8c4e27f69b6779e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/pseries/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c index 8e6b1ed1396e..8d710af50756 100644 --- a/arch/powerpc/platforms/pseries/smp.c +++ b/arch/powerpc/platforms/pseries/smp.c | |||
| @@ -292,7 +292,7 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu) | |||
| 292 | if (start_cpu == RTAS_UNKNOWN_SERVICE) | 292 | if (start_cpu == RTAS_UNKNOWN_SERVICE) |
| 293 | return 1; | 293 | return 1; |
| 294 | 294 | ||
| 295 | status = rtas_call(start_cpu, 3, 1, NULL, pcpu, start_here, lcpu); | 295 | status = rtas_call(start_cpu, 3, 1, NULL, pcpu, start_here, pcpu); |
| 296 | if (status != 0) { | 296 | if (status != 0) { |
| 297 | printk(KERN_ERR "start-cpu failed: %i\n", status); | 297 | printk(KERN_ERR "start-cpu failed: %i\n", status); |
| 298 | return 0; | 298 | return 0; |