Changeset 897fd8f1 in mainline for kernel/arch

Timestamp:

2017-12-19T18:18:15Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

55b56f4

Parents:

7f11dc6

Message:

Use <errno.h> instead of special ESYNCH_xx error codes.

Location:

kernel/arch

Files:

• ia32/src/smp/smp.c (modified) (2 diffs)
• sparc64/src/smp/sun4u/smp.c (modified) (1 diff)
• sparc64/src/smp/sun4v/smp.c (modified) (1 diff)

kernel/arch/ia32/src/smp/smp.c

@@ -39 +39 @@
 #include <arch/boot/boot.h>
 #include <assert.h>
+#include <errno.h>
 #include <genarch/acpi/acpi.h>
 #include <genarch/acpi/madt.h>
@@ -178 +179 @@
                          */
                         if (waitq_sleep_timeout(&ap_completion_wq, 1000000,
-                            SYNCH_FLAGS_NONE) == ESYNCH_TIMEOUT) {
+                            SYNCH_FLAGS_NONE, NULL) == ETIMEOUT) {
                                 log(LF_ARCH, LVL_NOTE, "%s: waiting for cpu%u "
                                     "(APIC ID = %d) timed out", __FUNCTION__,

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

@@ -106 +106 @@
         waking_up_mid = mid;
                 
-        if (waitq_sleep_timeout(&ap_completion_wq, 1000000, SYNCH_FLAGS_NONE) ==
-            ESYNCH_TIMEOUT)
+        if (waitq_sleep_timeout(&ap_completion_wq, 1000000,
+            SYNCH_FLAGS_NONE, NULL) == ETIMEOUT)
                 log(LF_ARCH, LVL_NOTE, "%s: waiting for processor (mid = %" PRIu32
                     ") timed out", __func__, mid);

kernel/arch/sparc64/src/smp/sun4v/smp.c

@@ -373 +373 @@
 #endif
         
-        if (waitq_sleep_timeout(&ap_completion_wq, 10000000, SYNCH_FLAGS_NONE) ==
-            ESYNCH_TIMEOUT)
+        if (waitq_sleep_timeout(&ap_completion_wq, 10000000,
+            SYNCH_FLAGS_NONE, NULL) == ETIMEOUT)
                 printf("%s: waiting for processor (cpuid = %" PRIu64 ") timed out\n",
                     __func__, cpuid);