From 9db52df128ca5d8df86fa783e9d3c04cab188cb4 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Wed, 23 Sep 2009 10:04:02 +0100
Subject: [PATCH] --- yaml --- r: 165522 b: refs/heads/master c:
 a70770998c1d99e86eea97294ae3cce059a18d7e h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/arch/frv/include/asm/hardirq.h | 17 ++++-------------
 trunk/arch/frv/kernel/process.c      |  4 ----
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 0fbf02305aa5..dab12933f56d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d19110baaf20d5183689287bdbcf91e26e40cb79
+refs/heads/master: a70770998c1d99e86eea97294ae3cce059a18d7e
diff --git a/trunk/arch/frv/include/asm/hardirq.h b/trunk/arch/frv/include/asm/hardirq.h
index fc47515822a2..5fc8b6f5bc55 100644
--- a/trunk/arch/frv/include/asm/hardirq.h
+++ b/trunk/arch/frv/include/asm/hardirq.h
@@ -12,24 +12,15 @@
 #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 */
+#include <asm/atomic.h>
 
 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
diff --git a/trunk/arch/frv/kernel/process.c b/trunk/arch/frv/kernel/process.c
index 0de50df74970..904255938216 100644
--- a/trunk/arch/frv/kernel/process.c
+++ b/trunk/arch/frv/kernel/process.c
@@ -83,13 +83,9 @@ void (*idle)(void) = core_sleep_idle;
  */
 void cpu_idle(void)
 {
-	int cpu = smp_processor_id();
-
 	/* 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)