[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20090804145726.GO20487@lst.de>
Date: Tue, 4 Aug 2009 16:57:26 +0200
From: Christoph Hellwig <hch@....de>
To: chris@...kel.net
Cc: linux-kernel@...r.kernel.org
Subject: [PATCH] xtensa: convert to asm-generic/hardirq.h
Also remove lots of unused irq_cpustat fields.
Signed-off-by: Christoph Hellwig <hch@....de>
Index: linux-2.6/arch/xtensa/include/asm/hardirq.h
===================================================================
--- linux-2.6.orig/arch/xtensa/include/asm/hardirq.h 2009-07-27 14:32:59.096148862 +0200
+++ linux-2.6/arch/xtensa/include/asm/hardirq.h 2009-07-27 14:57:53.327900849 +0200
@@ -11,18 +11,9 @@
#ifndef _XTENSA_HARDIRQ_H
#define _XTENSA_HARDIRQ_H
-#include <linux/cache.h>
-#include <asm/irq.h>
-
-/* 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 <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
+#define ack_bad_irq ack_bad_irq
+
+#include <asm-generic/hardirq.h>
#endif /* _XTENSA_HARDIRQ_H */
Index: linux-2.6/arch/xtensa/kernel/irq.c
===================================================================
--- linux-2.6.orig/arch/xtensa/kernel/irq.c 2009-07-27 14:53:46.241148947 +0200
+++ linux-2.6/arch/xtensa/kernel/irq.c 2009-07-27 14:58:01.261901510 +0200
@@ -27,15 +27,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
* handlers).
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists