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

Commit 508996b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'irq-fixes-for-linus' and 'sched-fixes-for-linus' of... 

Merge branches 'irq-fixes-for-linus' and 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: Fix incorrect unlock in __setup_irq()
  cris: Use generic show_interrupts()
  genirq: show_interrupts: Check desc->name before printing it blindly
  cris: Use accessor functions to set IRQ_PER_CPU flag
  cris: Fix irq conversion fallout

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched, kernel-doc: Fix runqueue_is_locked() description
parents 61929785 1c389795 58cbe247

arch/cris/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ config CRIS 
	select HAVE_IDE

	select HAVE_GENERIC_HARDIRQS

	select GENERIC_HARDIRQS_NO_DEPRECATED

	select GENERIC_IRQ_SHOW



config HZ

	int

arch/cris/arch-v10/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ init_IRQ(void) 


	/* Initialize IRQ handler descriptors. */

	for(i = 2; i < NR_IRQS; i++) {

		set_irq_desc_and_handler(i, &crisv10_irq_type,

		irq_set_chip_and_handler(i, &crisv10_irq_type,

					 handle_simple_irq);

		set_int_vector(i, interrupt[i]);

	}

arch/cris/arch-v32/kernel/irq.c

+4 −4
Original line number Diff line number Diff line
@@ -451,16 +451,16 @@ init_IRQ(void) 


	/* Point all IRQ's to bad handlers. */

	for (i = FIRST_IRQ, j = 0; j < NR_IRQS; i++, j++) {

		set_irq_chip_and_handler(j, &crisv32_irq_type,

		irq_set_chip_and_handler(j, &crisv32_irq_type,

					 handle_simple_irq);

		set_exception_vector(i, interrupt[j]);

	}



	/* Mark Timer and IPI IRQs as CPU local */

	irq_allocations[TIMER0_INTR_VECT - FIRST_IRQ].cpu = CPU_FIXED;

	irq_desc[TIMER0_INTR_VECT].status |= IRQ_PER_CPU;

	irq_set_status_flags(TIMER0_INTR_VECT, IRQ_PER_CPU);

	irq_allocations[IPI_INTR_VECT - FIRST_IRQ].cpu = CPU_FIXED;

	irq_desc[IPI_INTR_VECT].status |= IRQ_PER_CPU;

	irq_set_status_flags(IPI_INTR_VECT, IRQ_PER_CPU);



	set_exception_vector(0x00, nmi_interrupt);

	set_exception_vector(0x30, multiple_interrupt);

arch/cris/kernel/irq.c

+0 −39
Original line number Diff line number Diff line
@@ -37,45 +37,6 @@ 


#include <asm/io.h>



int show_interrupts(struct seq_file *p, void *v)

{

	int i = *(loff_t *) v, j;

	struct irqaction * action;

	unsigned long flags;



	if (i == 0) {

		seq_printf(p, "           ");

		for_each_online_cpu(j)

			seq_printf(p, "CPU%d       ",j);

		seq_putc(p, '\n');

	}



	if (i < NR_IRQS) {

		raw_spin_lock_irqsave(&irq_desc[i].lock, flags);

		action = irq_desc[i].action;

		if (!action)

			goto skip;

		seq_printf(p, "%3d: ",i);

#ifndef CONFIG_SMP

		seq_printf(p, "%10u ", kstat_irqs(i));

#else

		for_each_online_cpu(j)

			seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));

#endif

		seq_printf(p, " %14s", irq_desc[i].irq_data.chip->name);

		seq_printf(p, "  %s", action->name);



		for (action=action->next; action; action = action->next)

			seq_printf(p, ", %s", action->name);



		seq_putc(p, '\n');

skip:

		raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);

	}

	return 0;

}





/* called by the assembler IRQ entry functions defined in irq.h

 * to dispatch the interrupts to registered handlers

 * interrupts are disabled upon entry - depending on if the

kernel/irq/manage.c

+1 −1
Original line number Diff line number Diff line
@@ -1064,10 +1064,10 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) 
	ret = -EBUSY;



out_mask:

	raw_spin_unlock_irqrestore(&desc->lock, flags);

	free_cpumask_var(mask);



out_thread:

	raw_spin_unlock_irqrestore(&desc->lock, flags);

	if (new->thread) {

		struct task_struct *t = new->thread;