fiq_debugger: rockchip: fix compilation error on arm64
author黄涛 <huangtao@rock-chips.com>
Thu, 23 Oct 2014 09:03:52 +0000 (17:03 +0800)
committer黄涛 <huangtao@rock-chips.com>
Thu, 23 Oct 2014 09:03:52 +0000 (17:03 +0800)
drivers/staging/android/fiq_debugger/fiq_debugger.c

index b0204f398357c8d764f9149ae8b10f92f3409322..b02cfe89eb0c9fca4e760a41e97e53085342c724 100755 (executable)
@@ -361,6 +361,8 @@ static void fiq_debugger_dump_irqs(struct fiq_debugger_state *state)
                }
        }
        for (n = 0; n < NR_IPI; n++) {
+#define S(x,s) [x] = s
+#ifdef CONFIG_ARM
                enum ipi_msg_type {
                        IPI_WAKEUP,
                        IPI_TIMER,
@@ -372,7 +374,6 @@ static void fiq_debugger_dump_irqs(struct fiq_debugger_state *state)
                        IPI_CPU_BACKTRACE,
                };
                static const char *ipi_types[NR_IPI] = {
-#define S(x,s) [x] = s
                        S(IPI_WAKEUP, "CPU wakeup"),
                        S(IPI_TIMER, "Timer broadcast"),
                        S(IPI_RESCHEDULE, "Rescheduling"),
@@ -381,8 +382,24 @@ static void fiq_debugger_dump_irqs(struct fiq_debugger_state *state)
                        S(IPI_CPU_STOP, "CPU stop"),
                        S(IPI_COMPLETION, "Completion"),
                        S(IPI_CPU_BACKTRACE, "CPU backtrace"),
-#undef S
                };
+#elif defined(CONFIG_ARM64)
+               enum ipi_msg_type {
+                       IPI_RESCHEDULE,
+                       IPI_CALL_FUNC,
+                       IPI_CALL_FUNC_SINGLE,
+                       IPI_CPU_STOP,
+                       IPI_TIMER,
+               };
+               static const char *ipi_types[NR_IPI] = {
+                       S(IPI_RESCHEDULE, "Rescheduling"),
+                       S(IPI_CALL_FUNC, "Function call"),
+                       S(IPI_CALL_FUNC_SINGLE, "Single function call"),
+                       S(IPI_CPU_STOP, "CPU stop"),
+                       S(IPI_TIMER, "Timer broadcast"),
+               };
+#endif
+#undef S
                for (cpu = 0; cpu < NR_CPUS; cpu++) {
                        unsigned int irqs = __get_irq_stat(cpu, ipi_irqs[n]);
                        if (irqs == 0)