Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 428929a2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Fix breakage from irq change
parents 0cd61b68 8c1addbc

arch/ia64/kernel/irq.c

+4 −1
Original line number Diff line number Diff line
@@ -194,8 +194,11 @@ void fixup_irqs(void) 
	 */

	for (irq=0; irq < NR_IRQS; irq++) {

		if (vectors_in_migration[irq]) {

			struct pt_regs *old_regs = set_irq_regs(NULL);



			vectors_in_migration[irq]=0;

			__do_IRQ(irq, NULL);

			__do_IRQ(irq);

			set_irq_regs(old_regs);

		}

	}

arch/ia64/kernel/irq_ia64.c

+5 −2
Original line number Diff line number Diff line
@@ -226,6 +226,8 @@ void ia64_process_pending_intr(void) 
	  */

	while (vector != IA64_SPURIOUS_INT_VECTOR) {

		if (!IS_RESCHEDULE(vector)) {

			struct pt_regs *old_regs = set_irq_regs(NULL);



			ia64_setreg(_IA64_REG_CR_TPR, vector);

			ia64_srlz_d();
@@ -236,7 +238,8 @@ void ia64_process_pending_intr(void) 
			 * Probably could shared code.

			 */

			vectors_in_migration[local_vector_to_irq(vector)]=0;

			__do_IRQ(local_vector_to_irq(vector), NULL);

			__do_IRQ(local_vector_to_irq(vector));

			set_irq_regs(old_regs);



			/*

			 * Disable interrupts and send EOI
@@ -253,7 +256,7 @@ void ia64_process_pending_intr(void) 




#ifdef CONFIG_SMP

extern irqreturn_t handle_IPI (int irq, void *dev_id, struct pt_regs *regs);

extern irqreturn_t handle_IPI (int irq, void *dev_id);



static struct irqaction ipi_irqaction = {

	.handler =	handle_IPI,

arch/ia64/sn/kernel/sn2/timer_interrupt.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ extern irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs); 


#define SN_LB_INT_WAR_INTERVAL 100



void sn_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)

void sn_timer_interrupt(int irq, void *dev_id)

{

	/* LED blinking */

	if (!pda->hb_count--) {

drivers/serial/sn_console.c

+1 −1
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ static void sn_sal_timer_poll(unsigned long data) 
	if (!port->sc_port.irq) {

		spin_lock_irqsave(&port->sc_port.lock, flags);

		if (sn_process_input)

			sn_receive_chars(port, NULL, flags);

			sn_receive_chars(port, flags);

		sn_transmit_chars(port, TRANSMIT_RAW);

		spin_unlock_irqrestore(&port->sc_port.lock, flags);

		mod_timer(&port->sc_timer,