[PATCH] frv: convert to asm-generic/hardirq.h

[Christoph Hellwig]

And also remove the unused idle_timestamp field in irq_cpustat.

Signed-off-by: Christoph Hellwig <hch@xxxxxx>

Index: linux-2.6/arch/frv/include/asm/hardirq.h
===================================================================
--- linux-2.6.orig/arch/frv/include/asm/hardirq.h	2009-07-27 14:32:58.319148966 +0200
+++ linux-2.6/arch/frv/include/asm/hardirq.h	2009-07-27 14:55:22.007149596 +0200
@@ -12,24 +12,13 @@
 #ifndef __ASM_HARDIRQ_H
 #define __ASM_HARDIRQ_H
 
-#include <linux/threads.h>
-#include <linux/irq.h>
-
-typedef struct {
-	unsigned int __softirq_pending;
-	unsigned long idle_timestamp;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */
-
-#ifdef CONFIG_SMP
-#error SMP not available on FR-V
-#endif /* CONFIG_SMP */
-
 extern atomic_t irq_err_count;
 static inline void ack_bad_irq(int irq)
 {
 	atomic_inc(&irq_err_count);
 }
+#define ack_bad_irq ack_bad_irq
+
+#include <asm-generic/hardirq.h>
 
 #endif
Index: linux-2.6/arch/frv/kernel/process.c
===================================================================
--- linux-2.6.orig/arch/frv/kernel/process.c	2009-07-27 14:49:00.504898870 +0200
+++ linux-2.6/arch/frv/kernel/process.c	2009-07-27 14:49:06.778921938 +0200
@@ -88,8 +88,6 @@ void cpu_idle(void)
 	/* endless idle loop with no priority at all */
 	while (1) {
 		while (!need_resched()) {
-			irq_stat[cpu].idle_timestamp = jiffies;
-
 			check_pgt_cache();
 
 			if (!frv_dma_inprogress && idle)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/