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

Timestamp:

2013-09-11T11:56:39Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1db5669

Parents:

43dd8028

Message:

due to the removal of FRAME_KA, the return value of frame_alloc*() needs to be checked before converting the physical address to kernel address

File:

• kernel/arch/ia64/src/mm/vhpt.c (modified) (1 diff)

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

@@ -42 +42 @@
 uintptr_t vhpt_set_up(void)
 {
-        vhpt_base = (vhpt_entry_t *)
-            PA2KA(frame_alloc(SIZE2FRAMES(VHPT_SIZE), FRAME_ATOMIC, 0));
-        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;