diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-28 23:19:47 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-28 23:19:47 -0500 |
| commit | e3c6d4ee545e427b55882d97d3b663c6411645fe (patch) | |
| tree | 294326663fb757739a98083c2ddd570d1eaf7337 /arch/powerpc/platforms/powermac/smp.c | |
| parent | 5bc053089376217943187ed5153d0d1e5c5085b6 (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sparc64/kernel/idprom.c
Diffstat (limited to 'arch/powerpc/platforms/powermac/smp.c')
| -rw-r--r-- | arch/powerpc/platforms/powermac/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c index 40f72c2a4699..6b0711c15eca 100644 --- a/arch/powerpc/platforms/powermac/smp.c +++ b/arch/powerpc/platforms/powermac/smp.c | |||
| @@ -739,7 +739,7 @@ static void __init smp_core99_setup(int ncpus) | |||
| 739 | 739 | ||
| 740 | /* XXX should get this from reg properties */ | 740 | /* XXX should get this from reg properties */ |
| 741 | for (i = 1; i < ncpus; ++i) | 741 | for (i = 1; i < ncpus; ++i) |
| 742 | smp_hw_index[i] = i; | 742 | set_hard_smp_processor_id(i, i); |
| 743 | } | 743 | } |
| 744 | #endif | 744 | #endif |
| 745 | 745 | ||