ARM: fiq_debugger: fix compiling for v3.3

Call kernel_restart instead of arch_reset, the ARM reset handling
has changed.

Remove localtimer irq printing, they now show up in the regular
irq stats.

Change-Id: I523da343b292c5711f3e1cbfd766d32eea2da84e
Signed-off-by: Colin Cross <ccross@android.com>

diff --git a/arch/arm/common/fiq_debugger.c b/arch/arm/common/fiq_debugger.c
index 3ed18ae2ed80c13292005fd9cadf6eaddc030183..0e33748edd6080a860cdc07988a2ac29bb1e5f61 100644 (file)
--- a/arch/arm/common/fiq_debugger.c
+++ b/arch/arm/common/fiq_debugger.c
@@ -25,6 +25,7 @@
 #include <linux/kernel_stat.h>
 #include <linux/irq.h>
 #include <linux/delay.h>
+#include <linux/reboot.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/smp.h>
@@ -37,8 +38,6 @@
 #include <asm/fiq_glue.h>
 #include <asm/stacktrace.h>
 
-#include <mach/system.h>
-
 #include <linux/uaccess.h>
 
 #include "fiq_debugger_ringbuf.h"
@@ -357,7 +356,6 @@ static void dump_allregs(struct fiq_debugger_state *state, unsigned *regs)
 static void dump_irqs(struct fiq_debugger_state *state)
 {
        int n;
-       unsigned int cpu;
 
        debug_printf(state, "irqnr       total  since-last   status  name\n");
        for (n = 0; n < NR_IRQS; n++) {
@@ -371,16 +369,6 @@ static void dump_irqs(struct fiq_debugger_state *state)
                        (act && act->name) ? act->name : "???");
                state->last_irqs[n] = kstat_irqs(n);
        }
-
-       for (cpu = 0; cpu < NR_CPUS; cpu++) {
-
-               debug_printf(state, "LOC %d: %10u %11u\n", cpu,
-                            __IRQ_STAT(cpu, local_timer_irqs),
-                            __IRQ_STAT(cpu, local_timer_irqs) -
-                            state->last_local_timer_irqs[cpu]);
-               state->last_local_timer_irqs[cpu] =
-                       __IRQ_STAT(cpu, local_timer_irqs);
-       }
 }
 
 struct stacktrace_state {
@@ -605,7 +593,7 @@ static bool debug_fiq_exec(struct fiq_debugger_state *state,
        } else if (!strcmp(cmd, "bt")) {
                dump_stacktrace(state, (struct pt_regs *)regs, 100, svc_sp);
        } else if (!strcmp(cmd, "reboot")) {
-               arch_reset(0, 0);
+               kernel_restart(NULL);
        } else if (!strcmp(cmd, "irqs")) {
                dump_irqs(state);
        } else if (!strcmp(cmd, "kmsg")) {