[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20090804145441.GK20487@lst.de>
Date: Tue, 4 Aug 2009 16:54:41 +0200
From: Christoph Hellwig <hch@....de>
To: kyle@...artin.ca
Cc: linux-kernel@...r.kernel.org
Subject: [PATCH] parisc: convert to asm-generic/hardirq.h
Signed-off-by: Christoph Hellwig <hch@....de>
Index: linux-2.6/arch/parisc/include/asm/hardirq.h
===================================================================
--- linux-2.6.orig/arch/parisc/include/asm/hardirq.h 2009-07-27 14:32:58.773149123 +0200
+++ linux-2.6/arch/parisc/include/asm/hardirq.h 2009-07-27 14:57:11.262901883 +0200
@@ -1,29 +1,11 @@
/* hardirq.h: PA-RISC hard IRQ support.
*
* Copyright (C) 2001 Matthew Wilcox <matthew@....cx>
- *
- * The locking is really quite interesting. There's a cpu-local
- * count of how many interrupts are being handled, and a global
- * lock. An interrupt can only be serviced if the global lock
- * is free. You can't be sure no more interrupts are being
- * serviced until you've acquired the lock and then checked
- * all the per-cpu interrupt counts are all zero. It's a specialised
- * br_lock, and that's exactly how Sparc does it. We don't because
- * it's more locking for us. This way is lock-free in the interrupt path.
*/
#ifndef _PARISC_HARDIRQ_H
#define _PARISC_HARDIRQ_H
-#include <linux/threads.h>
-#include <linux/irq.h>
-
-typedef struct {
- unsigned long __softirq_pending; /* set_bit is used on this */
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
-
-void ack_bad_irq(unsigned int irq);
+#include <asm-generic/hardirq.h>
#endif /* _PARISC_HARDIRQ_H */
Index: linux-2.6/arch/parisc/kernel/irq.c
===================================================================
--- linux-2.6.orig/arch/parisc/kernel/irq.c 2009-07-27 14:53:45.982148913 +0200
+++ linux-2.6/arch/parisc/kernel/irq.c 2009-07-27 14:57:16.782158085 +0200
@@ -423,8 +423,3 @@ void __init init_IRQ(void)
set_eiem(cpu_eiem); /* EIEM : enable all external intr */
}
-
-void ack_bad_irq(unsigned int irq)
-{
- printk(KERN_WARNING "unexpected IRQ %d\n", irq);
-}
--
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