Changeset fd07e57b in mainline for kernel/genarch/src/acpi/acpi.c

Timestamp:

2014-01-05T21:25:41Z (10 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

4aa2a27

Parents:

aacdb8e (diff), ca05e9b (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 cherrypicked kernel logger.

• Old klog sybsystem was renamed to kio
• Kernel and user-space log messages are stored in both logs (kernel logs end up in log/kernel file)

File:

• kernel/genarch/src/acpi/acpi.c (modified) (2 diffs)

kernel/genarch/src/acpi/acpi.c

@@ -41 +41 @@
 #include <mm/page.h>
 #include <mm/km.h>
-#include <print.h>
+#include <log.h>
 
 #define RSDP_SIGNATURE      "RSD PTR "
@@ -211 +211 @@
         
         if ((acpi_rsdt) && (!acpi_sdt_check((uint8_t *) acpi_rsdt))) {
-                printf("RSDT: bad checksum\n");
+                log(LF_ARCH, LVL_ERROR, "RSDT: bad checksum");
                 return;
         }
         
         if ((acpi_xsdt) && (!acpi_sdt_check((uint8_t *) acpi_xsdt))) {
-                printf("XSDT: bad checksum\n");
+                log(LF_ARCH, LVL_ERROR, "XSDT: bad checksum");
                 return;
         }