diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-07-04 09:14:42 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-07-04 09:14:42 -0400 |
| commit | 07929dcb963786512c760dd3ecd148d89295e7e5 (patch) | |
| tree | f5db01392ebb968b4c8acb5a6b3b03a833bfcb02 /arch/alpha/kernel/irq_alpha.c | |
| parent | c2d9b8387bce8b4a0fd402fab7dc1319d11a418d (diff) | |
| parent | 19f7241a3b087bbf4dd107c979608fdb56c83a09 (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'arch/alpha/kernel/irq_alpha.c')
| -rw-r--r-- | arch/alpha/kernel/irq_alpha.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/alpha/kernel/irq_alpha.c b/arch/alpha/kernel/irq_alpha.c index e6ded33c6e22..9d34ce26e5ef 100644 --- a/arch/alpha/kernel/irq_alpha.c +++ b/arch/alpha/kernel/irq_alpha.c | |||
| @@ -55,6 +55,8 @@ do_entInt(unsigned long type, unsigned long vector, | |||
| 55 | #ifdef CONFIG_SMP | 55 | #ifdef CONFIG_SMP |
| 56 | { | 56 | { |
| 57 | long cpu; | 57 | long cpu; |
| 58 | |||
| 59 | local_irq_disable(); | ||
| 58 | smp_percpu_timer_interrupt(regs); | 60 | smp_percpu_timer_interrupt(regs); |
| 59 | cpu = smp_processor_id(); | 61 | cpu = smp_processor_id(); |
| 60 | if (cpu != boot_cpuid) { | 62 | if (cpu != boot_cpuid) { |