diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-13 21:17:54 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-13 21:17:54 -0500 |
| commit | 70ac551651a2c5a234b703d9a495817f2ca09639 (patch) | |
| tree | 71f55b9a3de438969a7a0d951971febf59784294 /arch/arm/kernel | |
| parent | 7f729ccff35befa08a836ab33a4372c7f6735645 (diff) | |
| parent | bd5d080ab99642e3245ef7cfa54490384c01d878 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/smp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index e55ea952f7aa..373c0959bc2f 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c | |||
| @@ -256,9 +256,7 @@ void __cpuexit cpu_die(void) | |||
| 256 | asmlinkage void __cpuinit secondary_start_kernel(void) | 256 | asmlinkage void __cpuinit secondary_start_kernel(void) |
| 257 | { | 257 | { |
| 258 | struct mm_struct *mm = &init_mm; | 258 | struct mm_struct *mm = &init_mm; |
| 259 | unsigned int cpu; | 259 | unsigned int cpu = smp_processor_id(); |
| 260 | |||
| 261 | cpu = smp_processor_id(); | ||
| 262 | 260 | ||
| 263 | printk("CPU%u: Booted secondary processor\n", cpu); | 261 | printk("CPU%u: Booted secondary processor\n", cpu); |
| 264 | 262 | ||