Changeset 89c57b6 in mainline for kernel/arch/sparc64/src/trap/sun4v/interrupt.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

88634420

Parents:

cefb126 (diff), 17279ead (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

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

@@ -87 +87 @@
                 KA2PA(cpu_mondo_queues[CPU->id]),
                 CPU_MONDO_NENTRIES) != HV_EOK)
-                        panic("Initializing mondo queue failed on CPU %d.\n",
+                        panic("Initializing mondo queue failed on CPU %" PRIu64 ".\n",
                             CPU->arch.id);
 }
@@ -111 +111 @@
                         ((void (*)(void)) data1)();
                 } else {
-                        printf("Spurious interrupt on %d, data = %" PRIx64 ".\n",
+                        printf("Spurious interrupt on %" PRIu64 ", data = %" PRIx64 ".\n",
                             CPU->arch.id, data1);
                 }