Changes in kernel/arch/sparc64/src/trap/sun4v/interrupt.c [95c4776:7da160b] in mainline

File:

• kernel/arch/sparc64/src/trap/sun4v/interrupt.c (modified) (3 diffs)

kernel/arch/sparc64/src/trap/sun4v/interrupt.c

@@ -36 +36 @@
 #include <arch/trap/interrupt.h>
 #include <arch/sparc64.h>
-#include <arch/trap/interrupt.h>
 #include <interrupt.h>
 #include <ddi/irq.h>
@@ -87 +86 @@
                 CPU_MONDO_QUEUE_ID,
                 KA2PA(cpu_mondo_queues[CPU->id]),
-                CPU_MONDO_NENTRIES) != EOK)
+                CPU_MONDO_NENTRIES) != HV_EOK)
                         panic("Initializing mondo queue failed on CPU %d.\n",
-                        CPU->arch.id);
+                            CPU->arch.id);
 }
 
@@ -98 +97 @@
 void cpu_mondo(void)
 {
+#ifdef CONFIG_SMP
         unsigned int tail = asi_u64_read(ASI_QUEUE, VA_CPU_MONDO_QUEUE_TAIL);
         unsigned int head = asi_u64_read(ASI_QUEUE, VA_CPU_MONDO_QUEUE_HEAD);
 
         while (head != tail) {
-
                 uint64_t data1 = cpu_mondo_queues[CPU->id][0];
 
                 head = (head + CPU_MONDO_ENTRY_SIZE * sizeof(uint64_t)) %
-                        (CPU_MONDO_QUEUE_SIZE * sizeof(uint64_t));
+                    (CPU_MONDO_QUEUE_SIZE * sizeof(uint64_t));
                 asi_u64_write(ASI_QUEUE, VA_CPU_MONDO_QUEUE_HEAD, head);
 
-                if (data1 == (uint64_t) tlb_shootdown_ipi_recv) {
+                if (data1 == (uintptr_t) tlb_shootdown_ipi_recv) {
                         ((void (*)(void)) data1)();
                 } else {
                         printf("Spurious interrupt on %d, data = %lx.\n",
-                                CPU->arch.id, data1);
+                            CPU->arch.id, data1);
                 }
-
         }
-
+#endif
 }