diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-09-25 09:28:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-25 09:28:58 +0200 |
| commit | 9c9ab385bc6c3f0787f742d5e9baf04063d9697a (patch) | |
| tree | cc6ac425f7580a40d011ad2e8fc7974678843e0b /drivers/sh/intc/virq.c | |
| parent | 93f13a9f96771a064c716364aebc6e283b186eb8 (diff) | |
| parent | bcee19f424a0d8c26ecf2607b73c690802658b29 (diff) | |
| download | talos-op-linux-9c9ab385bc6c3f0787f742d5e9baf04063d9697a.tar.gz talos-op-linux-9c9ab385bc6c3f0787f742d5e9baf04063d9697a.zip | |
Merge branch 'linus' into x86/asm, to refresh the tree before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/sh/intc/virq.c')
| -rw-r--r-- | drivers/sh/intc/virq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sh/intc/virq.c b/drivers/sh/intc/virq.c index bafc51c6f0ba..e7899624aa0b 100644 --- a/drivers/sh/intc/virq.c +++ b/drivers/sh/intc/virq.c @@ -109,7 +109,7 @@ static int add_virq_to_pirq(unsigned int irq, unsigned int virq) return 0; } -static void intc_virq_handler(unsigned int __irq, struct irq_desc *desc) +static void intc_virq_handler(struct irq_desc *desc) { unsigned int irq = irq_desc_get_irq(desc); struct irq_data *data = irq_desc_get_irq_data(desc); @@ -127,7 +127,7 @@ static void intc_virq_handler(unsigned int __irq, struct irq_desc *desc) handle = (unsigned long)irq_desc_get_handler_data(vdesc); addr = INTC_REG(d, _INTC_ADDR_E(handle), 0); if (intc_reg_fns[_INTC_FN(handle)](addr, handle, 0)) - generic_handle_irq_desc(entry->irq, vdesc); + generic_handle_irq_desc(vdesc); } } |
