diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-03-01 09:28:53 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-03-01 09:28:58 +0100 |
commit | e2f4699ac15fe36de1288505bc6e6e5a8603ab1b (patch) | |
tree | 8078d3ff21eaa0a0ed6e446ac94f3681e831cad1 /arch/sparc/kernel/smp_64.c | |
parent | 1883c79a57a5fe25309007590cccb1b2782c41b2 (diff) | |
parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
download | op-kernel-dev-e2f4699ac15fe36de1288505bc6e6e5a8603ab1b.zip op-kernel-dev-e2f4699ac15fe36de1288505bc6e6e5a8603ab1b.tar.gz |
Merge branch 'linus' into core/rcu
Merge reason: Backmerge latest upstream to queue up dependent fix in the
scheduler.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sparc/kernel/smp_64.c')
-rw-r--r-- | arch/sparc/kernel/smp_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c index aa36223..eb14844 100644 --- a/arch/sparc/kernel/smp_64.c +++ b/arch/sparc/kernel/smp_64.c @@ -370,7 +370,7 @@ static int __cpuinit smp_boot_one_cpu(unsigned int cpu) } else { struct device_node *dp = of_find_node_by_cpuid(cpu); - prom_startcpu(dp->node, entry, cookie); + prom_startcpu(dp->phandle, entry, cookie); } for (timeout = 0; timeout < 50000; timeout++) { |