From e520c410854bab763be24e0fce7ba89dc252efee Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Mon, 24 May 2010 14:31:46 -0700 Subject: [PATCH] xtensa: convert to asm-generic/hardirq.h Also remove lots of unused irq_cpustat fields. Signed-off-by: Christoph Hellwig Cc: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/xtensa/include/asm/hardirq.h | 15 +++------------ arch/xtensa/kernel/irq.c | 9 --------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/arch/xtensa/include/asm/hardirq.h b/arch/xtensa/include/asm/hardirq.h index 87cb19d1b10c..26664cef8f11 100644 --- a/arch/xtensa/include/asm/hardirq.h +++ b/arch/xtensa/include/asm/hardirq.h @@ -11,18 +11,9 @@ #ifndef _XTENSA_HARDIRQ_H #define _XTENSA_HARDIRQ_H -#include -#include - -/* headers.S is sensitive to the offsets of these fields */ -typedef struct { - unsigned int __softirq_pending; - unsigned int __syscall_count; - struct task_struct * __ksoftirqd_task; /* waitqueue is too large */ - unsigned int __nmi_count; /* arch dependent */ -} ____cacheline_aligned irq_cpustat_t; - void ack_bad_irq(unsigned int irq); -#include /* Standard mappings for irq_cpustat_t above */ +#define ack_bad_irq ack_bad_irq + +#include #endif /* _XTENSA_HARDIRQ_H */ diff --git a/arch/xtensa/kernel/irq.c b/arch/xtensa/kernel/irq.c index 8cd38484e130..c64a5d387de5 100644 --- a/arch/xtensa/kernel/irq.c +++ b/arch/xtensa/kernel/irq.c @@ -26,15 +26,6 @@ static unsigned int cached_irq_mask; atomic_t irq_err_count; -/* - * 'what should we do if we get a hw irq event on an illegal vector'. - * each architecture has to answer this themselves. - */ -void ack_bad_irq(unsigned int irq) -{ - printk("unexpected IRQ trap at vector %02x\n", irq); -} - /* * do_IRQ handles all normal device IRQ's (the special * SMP cross-CPU interrupts have their own specific -- 2.30.2