Changeset fe56c08a in mainline for kernel/arch/ia64/src/ia64.c

Timestamp:

2012-01-28T09:17:24Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

ca3d77a

Parents:

8da2c60 (diff), 9970a5a (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 with mainline

File:

• kernel/arch/ia64/src/ia64.c (modified) (4 diffs)

kernel/arch/ia64/src/ia64.c

@@ -53 +53 @@
 #include <genarch/srln/srln.h>
 #include <mm/page.h>
+#include <mm/km.h>
 
 #ifdef MACHINE_ski
@@ -69 +70 @@
 void arch_pre_main(void)
 {
-        init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS);
+        init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS,
+            CONFIG_INIT_TASKS);
         size_t i;
+
         for (i = 0; i < init.cnt; i++) {
-                init.tasks[i].addr =
-                    ((unsigned long) bootinfo->taskmap.tasks[i].addr) |
-                    VRN_MASK;
+                init.tasks[i].paddr =
+                    (uintptr_t) bootinfo->taskmap.tasks[i].addr;
                 init.tasks[i].size = bootinfo->taskmap.tasks[i].size;
                 str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN,
@@ -87 +89 @@
 static void iosapic_init(void)
 {
-        uintptr_t IOSAPIC = hw_map(iosapic_base, PAGE_SIZE);
+        uintptr_t IOSAPIC = km_map(iosapic_base, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
         int i;
         
@@ -115 +118 @@
         if (config.cpu_active == 1) {
                 /* Map the page with legacy I/O. */
-                legacyio_virt_base = hw_map(LEGACYIO_PHYS_BASE, LEGACYIO_SIZE);
+                legacyio_virt_base = km_map(LEGACYIO_PHYS_BASE, LEGACYIO_SIZE,
+                    PAGE_WRITE | PAGE_NOT_CACHEABLE);
 
                 iosapic_init();