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

Commit 7ea5db8e authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
parents eee7631f 6aba74f2

Makefile

+2 −2
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 38

EXTRAVERSION =

SUBLEVEL = 39

EXTRAVERSION = -rc1

NAME = Flesh-Eating Bats with Fangs



# *DOCUMENTATION*

arch/alpha/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ config ALPHA 
	select HAVE_GENERIC_HARDIRQS

	select GENERIC_IRQ_PROBE

	select AUTO_IRQ_AFFINITY if SMP

	select GENERIC_HARDIRQS_NO_DEPRECATED

	select GENERIC_IRQ_SHOW

	help

	  The Alpha is a 64-bit general-purpose processor designed and

	  marketed by the Digital Equipment Corporation of blessed memory,

arch/alpha/kernel/irq.c

+10 −57
Original line number Diff line number Diff line
@@ -67,56 +67,10 @@ int irq_select_affinity(unsigned int irq) 
}

#endif /* CONFIG_SMP */



int

show_interrupts(struct seq_file *p, void *v)

int arch_show_interrupts(struct seq_file *p, int prec)

{

	int j;

	int irq = *(loff_t *) v;

	struct irqaction * action;

	struct irq_desc *desc;

	unsigned long flags;



#ifdef CONFIG_SMP

	if (irq == 0) {

		seq_puts(p, "           ");

		for_each_online_cpu(j)

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

		seq_putc(p, '\n');

	}

#endif



	if (irq < ACTUAL_NR_IRQS) {

		desc = irq_to_desc(irq);



		if (!desc)

			return 0;



		raw_spin_lock_irqsave(&desc->lock, flags);

		action = desc->action;

		if (!action) 

			goto unlock;

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

#ifndef CONFIG_SMP

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

#else

		for_each_online_cpu(j)

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

#endif

		seq_printf(p, " %14s", get_irq_desc_chip(desc)->name);

		seq_printf(p, "  %c%s",

			(action->flags & IRQF_DISABLED)?'+':' ',

			action->name);



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

			seq_printf(p, ", %c%s",

				  (action->flags & IRQF_DISABLED)?'+':' ',

				   action->name);

		}



		seq_putc(p, '\n');

unlock:

		raw_spin_unlock_irqrestore(&desc->lock, flags);

	} else if (irq == ACTUAL_NR_IRQS) {

#ifdef CONFIG_SMP

	seq_puts(p, "IPI: ");

	for_each_online_cpu(j)
@@ -128,7 +82,6 @@ show_interrupts(struct seq_file *p, void *v) 
		seq_printf(p, "%10lu ", per_cpu(irq_pmi_count, j));

	seq_puts(p, "          Performance Monitoring\n");

	seq_printf(p, "ERR: %10lu\n", irq_err_count);

	}

	return 0;

}

arch/alpha/kernel/irq_alpha.c

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ struct irqaction timer_irqaction = { 
void __init

init_rtc_irq(void)

{

	set_irq_chip_and_handler_name(RTC_IRQ, &no_irq_chip,

	irq_set_chip_and_handler_name(RTC_IRQ, &no_irq_chip,

				      handle_simple_irq, "RTC");

	setup_irq(RTC_IRQ, &timer_irqaction);

}

arch/alpha/kernel/irq_i8259.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ init_i8259a_irqs(void) 
	outb(0xff, 0xA1);	/* mask all of 8259A-2 */



	for (i = 0; i < 16; i++) {

		set_irq_chip_and_handler(i, &i8259a_irq_type, handle_level_irq);

		irq_set_chip_and_handler(i, &i8259a_irq_type, handle_level_irq);

	}



	setup_irq(2, &cascade);