From 7d7305d4c7d8d87588ae987047dbd72c2191e977 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Wed, 22 Apr 2009 15:31:38 +0000 Subject: [PATCH] --- yaml --- r: 149632 b: refs/heads/master c: 9b647a30cbc228259555d6b0b6bc7d9ec798f907 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/machdep.h | 4 ++++ trunk/arch/powerpc/kernel/irq.c | 7 ------- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 4447379c40ac..73fe88492091 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7cb10d6d23f451eec3d1f0f4e4e8862333fa152 +refs/heads/master: 9b647a30cbc228259555d6b0b6bc7d9ec798f907 diff --git a/trunk/arch/powerpc/include/asm/machdep.h b/trunk/arch/powerpc/include/asm/machdep.h index 0efdb1dfdc5f..11d1fc3a8962 100644 --- a/trunk/arch/powerpc/include/asm/machdep.h +++ b/trunk/arch/powerpc/include/asm/machdep.h @@ -110,6 +110,10 @@ struct machdep_calls { void (*show_percpuinfo)(struct seq_file *m, int i); void (*init_IRQ)(void); + + /* Return an irq, or NO_IRQ to indicate there are none pending. + * If for some reason there is no irq, but the interrupt + * shouldn't be counted as spurious, return NO_IRQ_IGNORE. */ unsigned int (*get_irq)(void); #ifdef CONFIG_KEXEC void (*kexec_cpu_down)(int crash_shutdown, int secondary); diff --git a/trunk/arch/powerpc/kernel/irq.c b/trunk/arch/powerpc/kernel/irq.c index 463b6ab9d6b9..a5fe12aa937d 100644 --- a/trunk/arch/powerpc/kernel/irq.c +++ b/trunk/arch/powerpc/kernel/irq.c @@ -326,13 +326,6 @@ void do_IRQ(struct pt_regs *regs) check_stack_overflow(); - /* - * Every platform is required to implement ppc_md.get_irq. - * This function will either return an irq number or NO_IRQ to - * indicate there are no more pending. - * The value NO_IRQ_IGNORE is for buggy hardware and means that this - * IRQ has already been handled. -- Tom - */ irq = ppc_md.get_irq(); if (irq != NO_IRQ && irq != NO_IRQ_IGNORE)