[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20090804144952.GC20487@lst.de>
Date: Tue, 4 Aug 2009 16:49:52 +0200
From: Christoph Hellwig <hch@....de>
To: linux-cris-kernel@...s.com
Cc: linux-kernel@...r.kernel.org
Subject: [PATCH] cris: convert to asm-generic/hardirq.h
Signed-off-by: Christoph Hellwig <hch@....de>
Index: linux-2.6/arch/cris/include/asm/hardirq.h
===================================================================
--- linux-2.6.orig/arch/cris/include/asm/hardirq.h 2009-07-27 14:32:58.267148765 +0200
+++ linux-2.6/arch/cris/include/asm/hardirq.h 2009-07-27 14:55:19.652910119 +0200
@@ -2,16 +2,6 @@
#define __ASM_HARDIRQ_H
#include <asm/irq.h>
-#include <linux/threads.h>
-#include <linux/cache.h>
-
-typedef struct {
- unsigned int __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
-
-void ack_bad_irq(unsigned int irq);
#define HARDIRQ_BITS 8
@@ -24,4 +14,6 @@ void ack_bad_irq(unsigned int irq);
# error HARDIRQ_BITS is too low!
#endif
+#include <asm-generic/hardirq.h>
+
#endif /* __ASM_HARDIRQ_H */
Index: linux-2.6/arch/cris/kernel/irq.c
===================================================================
--- linux-2.6.orig/arch/cris/kernel/irq.c 2009-07-27 14:53:45.590898928 +0200
+++ linux-2.6/arch/cris/kernel/irq.c 2009-07-27 14:54:58.635901441 +0200
@@ -38,11 +38,6 @@
#include <asm/io.h>
-void ack_bad_irq(unsigned int irq)
-{
- printk("unexpected IRQ trap at vector %02x\n", irq);
-}
-
int show_interrupts(struct seq_file *p, void *v)
{
int i = *(loff_t *) v, j;
--
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