Commit b34e138e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score 

* 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score:
  score: Use generic show_interrupts()
  score: Convert to new irq function names
  score: lost a semicolon in asm/irqflags.h
  score: Select GENERIC_HARDIRQS_NO_DEPRECATED
  score: Convert irq_chip to new functions
parents 445aef37 324808c2

arch/score/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ menu "Machine selection" 
config SCORE

       def_bool y

       select HAVE_GENERIC_HARDIRQS

       select GENERIC_HARDIRQS_NO_DEPRECATED

       select GENERIC_IRQ_SHOW



choice

	prompt "System type"

arch/score/include/asm/irqflags.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static inline unsigned long arch_local_save_flags(void) 


static inline unsigned long arch_local_irq_save(void)

{

	unsigned long flags

	unsigned long flags;



	asm volatile(

		"	mfcr	r8, cr0		\n"

arch/score/kernel/irq.c

+8 −45
Original line number Diff line number Diff line
@@ -52,9 +52,9 @@ asmlinkage void do_IRQ(int irq) 
	irq_exit();

}



static void score_mask(unsigned int irq_nr)

static void score_mask(struct irq_data *d)

{

	unsigned int irq_source = 63 - irq_nr;

	unsigned int irq_source = 63 - d->irq;



	if (irq_source < 32)

		__raw_writel((__raw_readl(SCORE_PIC + INT_MASKL) | \
@@ -64,9 +64,9 @@ static void score_mask(unsigned int irq_nr) 
			(1 << (irq_source - 32))), SCORE_PIC + INT_MASKH);

}



static void score_unmask(unsigned int irq_nr)

static void score_unmask(struct irq_data *d)

{

	unsigned int irq_source = 63 - irq_nr;

	unsigned int irq_source = 63 - d->irq;



	if (irq_source < 32)

		__raw_writel((__raw_readl(SCORE_PIC + INT_MASKL) & \
@@ -78,9 +78,9 @@ static void score_unmask(unsigned int irq_nr) 


struct irq_chip score_irq_chip = {

	.name		= "Score7-level",

	.mask		= score_mask,

	.mask_ack	= score_mask,

	.unmask		= score_unmask,

	.irq_mask	= score_mask,

	.irq_mask_ack	= score_mask,

	.irq_unmask	= score_unmask,

};



/*
@@ -92,7 +92,7 @@ void __init init_IRQ(void) 
	unsigned long target_addr;



	for (index = 0; index < NR_IRQS; ++index)

		set_irq_chip_and_handler(index, &score_irq_chip,

		irq_set_chip_and_handler(index, &score_irq_chip,

					 handle_level_irq);



	for (target_addr = IRQ_VECTOR_BASE_ADDR;
@@ -109,40 +109,3 @@ void __init init_IRQ(void) 
		: : "r" (EXCEPTION_VECTOR_BASE_ADDR | \

			VECTOR_ADDRESS_OFFSET_MODE16));

}
 


/*

 * Generic, controller-independent functions:

 */

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

{

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

	struct irqaction *action;

	unsigned long flags;



	if (i == 0) {

		seq_puts(p, "           ");

		for_each_online_cpu(cpu)

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

		seq_putc(p, '\n');

	}



	if (i < NR_IRQS) {

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

		action = irq_desc[i].action;

		if (!action)

			goto unlock;



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

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

		seq_printf(p, " %8s", irq_desc[i].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');

unlock:

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

	}



	return 0;

}