Changeset 6843a9c in mainline for kernel/arch/ia32/src/smp/smp.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• kernel/arch/ia32/src/smp/smp.c (modified) (2 diffs)

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

@@ -47 +47 @@
 #include <debug.h>
 #include <arch/asm.h>
+#include <mm/page.h>
 #include <mm/frame.h>
-#include <mm/page.h>
+#include <mm/km.h>
 #include <mm/slab.h>
 #include <mm/as.h>
@@ -72 +73 @@
         
         if (config.cpu_count > 1) {
-                l_apic = (uint32_t *) hw_map((uintptr_t) l_apic, PAGE_SIZE);
-                io_apic = (uint32_t *) hw_map((uintptr_t) io_apic, PAGE_SIZE);
+                l_apic = (uint32_t *) km_map((uintptr_t) l_apic, PAGE_SIZE,
+                    PAGE_WRITE | PAGE_NOT_CACHEABLE);
+                io_apic = (uint32_t *) km_map((uintptr_t) io_apic, PAGE_SIZE,
+                    PAGE_WRITE | PAGE_NOT_CACHEABLE);
         }
 }