Changeset 95c675b in mainline for kernel/arch/sparc64/src/smp/sun4u/ipi.c

Timestamp:

2017-10-17T13:11:35Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

• kernel/arch/sparc64/src/smp/sun4u/ipi.c (modified) (3 diffs)

kernel/arch/sparc64/src/smp/sun4u/ipi.c

@@ -35 +35 @@
 #include <smp/ipi.h>
 #include <arch/smp/sun4u/ipi.h>
+#include <assert.h>
 #include <cpu.h>
 #include <arch.h>
@@ -103 +104 @@
                 panic("Interrupt Dispatch Status busy bit set\n");
         
-        ASSERT(!(pstate_read() & PSTATE_IE_BIT));
+        assert(!(pstate_read() & PSTATE_IE_BIT));
         
         do {
@@ -185 +186 @@
 void ipi_unicast_arch(unsigned int cpu_id, int ipi)
 {
-        ASSERT(&cpus[cpu_id] != CPU);
+        assert(&cpus[cpu_id] != CPU);
         
         if (ipi == IPI_SMP_CALL) {