Changeset 3f03199 in mainline for kernel/arch/ia64/src/mm/vhpt.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• kernel/arch/ia64/src/mm/vhpt.c (modified) (2 diffs)

kernel/arch/ia64/src/mm/vhpt.c

@@ -42 +42 @@
 uintptr_t vhpt_set_up(void)
 {
-        vhpt_base = frame_alloc(VHPT_WIDTH - FRAME_WIDTH,
-            FRAME_KA | FRAME_ATOMIC);
-        if (!vhpt_base)
+        uintptr_t vhpt_frame =
+            frame_alloc(SIZE2FRAMES(VHPT_SIZE), FRAME_ATOMIC, 0);
+        if (!vhpt_frame)
                 panic("Kernel configured with VHPT but no memory for table.");
+        
+        vhpt_base = (vhpt_entry_t *) PA2KA(vhpt_frame);
         vhpt_invalidate_all();
         return (uintptr_t) vhpt_base;
@@ -82 +84 @@
 void vhpt_invalidate_all()
 {
-        memsetb(vhpt_base, 1 << VHPT_WIDTH, 0);
+        memsetb(vhpt_base, VHPT_SIZE, 0);
 }