Skip to contentSkip to conversation

frv: convert to asm-generic/hardirq.h

PATCH New Christoph Hellwig 1 participant 1 message Aug 4, 2009

lore
Share & tools
lore
#0 lore raw

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

And also remove the unused idle_timestamp field in irq_cpustat.

arch/frv/include/asm/hardirq.h +3 -14
Index: linux-2.6/arch/frv/include/asm/hardirq.h
===================================================================
@@ -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
arch/frv/kernel/process.c +0 -2
Index: linux-2.6/arch/frv/kernel/process.c
===================================================================
@@ -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)