diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-01 17:53:45 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-01 17:53:45 +0000 |
| commit | 657e1de8e742cf81153d2d15545948bd58294200 (patch) | |
| tree | 0fa3df23305e3763027f819cde6016dde8b24223 /arch/arm/kernel/smp.c | |
| parent | 93982535a201399c0023c1166a7f16a335134d5a (diff) | |
| parent | 6f13d278836d7251168631faeb0cbf5e4cdd98e5 (diff) | |
Merge branch 'for-rmk-realview' of git://linux-arm.org/linux-2.6 into devel
Diffstat (limited to 'arch/arm/kernel/smp.c')
| -rw-r--r-- | arch/arm/kernel/smp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index e42a749a56dd..019237d21622 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -181,7 +181,7 @@ int __cpuexit __cpu_disable(void) /* * Stop the local timer for this CPU. */ - local_timer_stop(cpu); + local_timer_stop(); /* * Flush user cache and TLB mappings, and then remove this CPU @@ -284,7 +284,7 @@ asmlinkage void __cpuinit secondary_start_kernel(void) /* * Setup local timer for this CPU. */ - local_timer_setup(cpu); + local_timer_setup(); calibrate_delay(); |