diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-17 07:08:34 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-17 07:08:34 -0500 |
| commit | 9466d6036f73481104039fbe99338baed11c8fea (patch) | |
| tree | cc889fa3071be5fba09417eb17be3c8d2c5271d0 /arch/x86/kernel/smpboot.c | |
| parent | 1f3f424a6bee9de4d839be9951f4296333fac014 (diff) | |
| parent | 83b19597f793fd5f91533bda0dc2eb3d21936798 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/travis/linux-2.6-cpus4096-for-ingo into cpus4096
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 199dcbb73d37..be9466788043 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
| @@ -1344,7 +1344,7 @@ void cpu_disable_common(void) | |||
| 1344 | lock_vector_lock(); | 1344 | lock_vector_lock(); |
| 1345 | remove_cpu_from_maps(cpu); | 1345 | remove_cpu_from_maps(cpu); |
| 1346 | unlock_vector_lock(); | 1346 | unlock_vector_lock(); |
| 1347 | fixup_irqs(cpu_online_map); | 1347 | fixup_irqs(); |
| 1348 | } | 1348 | } |
| 1349 | 1349 | ||
| 1350 | int native_cpu_disable(void) | 1350 | int native_cpu_disable(void) |