From 9d569b6d0bd0537de59f33663d881996694fed91 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Wed, 13 Jul 2011 20:29:24 +0200
Subject: [PATCH] --- yaml --- r: 259077 b: refs/heads/master c:
 8c9f08f9de38c9af3a946faf0cccd7fc46978443 h: refs/heads/master i:   259075:
 943c6dcd4d994222d91702a4a63ff843a8365974 v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/m68k/kernel/irq.c           | 10 ++++++++++
 trunk/arch/m68k/platform/68328/entry.S |  2 +-
 trunk/arch/m68k/platform/68328/ints.c  |  3 ---
 trunk/arch/m68k/platform/68360/entry.S |  2 +-
 trunk/arch/m68k/platform/68360/ints.c  |  3 ---
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index d509eddd0616..4b51cbafdf63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 739735d5fea3c3997b2a659068a618b07bc9a73a
+refs/heads/master: 8c9f08f9de38c9af3a946faf0cccd7fc46978443
diff --git a/trunk/arch/m68k/kernel/irq.c b/trunk/arch/m68k/kernel/irq.c
index 544b8717d499..c73988cfa90f 100644
--- a/trunk/arch/m68k/kernel/irq.c
+++ b/trunk/arch/m68k/kernel/irq.c
@@ -28,3 +28,13 @@ asmlinkage void do_IRQ(int irq, struct pt_regs *regs)
 
 	set_irq_regs(oldregs);
 }
+
+
+/* The number of spurious interrupts */
+atomic_t irq_err_count;
+
+int arch_show_interrupts(struct seq_file *p, int prec)
+{
+	seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
+	return 0;
+}
diff --git a/trunk/arch/m68k/platform/68328/entry.S b/trunk/arch/m68k/platform/68328/entry.S
index 4ed7a65d5aa0..293e1eba9acc 100644
--- a/trunk/arch/m68k/platform/68328/entry.S
+++ b/trunk/arch/m68k/platform/68328/entry.S
@@ -236,7 +236,7 @@ ret_from_interrupt:
  * Handler for uninitialized and spurious interrupts.
  */
 ENTRY(bad_interrupt)
-	addql	#1,num_spurious
+	addql	#1,irq_err_count
 	rte
 
 /*
diff --git a/trunk/arch/m68k/platform/68328/ints.c b/trunk/arch/m68k/platform/68328/ints.c
index 22acb60b541a..4bd456531f91 100644
--- a/trunk/arch/m68k/platform/68328/ints.c
+++ b/trunk/arch/m68k/platform/68328/ints.c
@@ -70,9 +70,6 @@ asmlinkage irqreturn_t inthandler7(void);
 
 extern e_vector *_ramvec;
 
-/* The number of spurious interrupts */
-volatile unsigned int num_spurious;
-
 /* The 68k family did not have a good way to determine the source
  * of interrupts until later in the family.  The EC000 core does
  * not provide the vector number on the stack, we vector everything
diff --git a/trunk/arch/m68k/platform/68360/entry.S b/trunk/arch/m68k/platform/68360/entry.S
index 0ede6702127a..abbb89672ea0 100644
--- a/trunk/arch/m68k/platform/68360/entry.S
+++ b/trunk/arch/m68k/platform/68360/entry.S
@@ -157,7 +157,7 @@ ret_from_interrupt:
  * Handler for uninitialized and spurious interrupts.
  */
 bad_interrupt:
-	addql	#1,num_spurious
+	addql	#1,irq_err_count
 	rte
 
 /*
diff --git a/trunk/arch/m68k/platform/68360/ints.c b/trunk/arch/m68k/platform/68360/ints.c
index 44443820d208..7b40202d9638 100644
--- a/trunk/arch/m68k/platform/68360/ints.c
+++ b/trunk/arch/m68k/platform/68360/ints.c
@@ -34,9 +34,6 @@ asmlinkage void inthandler(void);
 
 extern void *_ramvec[];
 
-/* The number of spurious interrupts */
-volatile unsigned int num_spurious;
-
 static void intc_irq_unmask(struct irq_data *d)
 {
 	pquicc->intr_cimr |= (1 << d->irq);