Changeset 5828554 in mainline for kernel/genarch/src/acpi/madt.c

Timestamp:

2014-01-19T14:37:22Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

cf982ff

Parents:

2f591127 (diff), 476f62c (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/genarch/src/acpi/madt.c (modified) (3 diffs)

kernel/genarch/src/acpi/madt.c

@@ -43 +43 @@
 #include <debug.h>
 #include <config.h>
-#include <print.h>
+#include <log.h>
 #include <mm/slab.h>
 #include <memstr.h>
@@ -236 +236 @@
                 case MADT_L_SAPIC:
                 case MADT_PLATFORM_INTR_SRC:
-                        printf("MADT: Skipping %s entry (type=%" PRIu8 ")\n",
+                        log(LF_ARCH, LVL_WARN,
+                            "MADT: Skipping %s entry (type=%" PRIu8 ")",
                             entry[hdr->type], hdr->type);
                         break;
@@ -242 +243 @@
                         if ((hdr->type >= MADT_RESERVED_SKIP_BEGIN)
                             && (hdr->type <= MADT_RESERVED_SKIP_END))
-                                printf("MADT: Skipping reserved entry (type=%" PRIu8 ")\n",
+                                log(LF_ARCH, LVL_NOTE,
+                                    "MADT: Skipping reserved entry (type=%" PRIu8 ")",
                                     hdr->type);
                                 
                         if (hdr->type >= MADT_RESERVED_OEM_BEGIN)
-                                printf("MADT: Skipping OEM entry (type=%" PRIu8 ")\n",
+                                log(LF_ARCH, LVL_NOTE,
+                                    "MADT: Skipping OEM entry (type=%" PRIu8 ")",
                                     hdr->type);