Commit 5b0dac74 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Disable timer interrupts in fixup_irqs().
parents bdce291a 2eb2f779

arch/sparc64/kernel/irq.c

+2 −0
Original line number Diff line number Diff line
@@ -792,6 +792,8 @@ void fixup_irqs(void) 
		}

		spin_unlock_irqrestore(&irq_desc[irq].lock, flags);

	}



	tick_ops->disable_irq();

}

#endif