Changeset 3a0a4d8 in mainline for kernel/arch/ia64/src

Timestamp:

2013-09-12T07:54:05Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

95027b5

Parents:

47f5a77 (diff), 64f3d3b (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

Location:

kernel/arch/ia64/src

Files:

• ddi/ddi.c (modified) (3 diffs)
• mm/vhpt.c (modified) (2 diffs)

kernel/arch/ia64/src/ddi/ddi.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Jakub Jermar
- * Copyright (c) 2008 Jakub vana
+ * Copyright (c) 2008 Jakub Vana
  * All rights reserved.
  *
@@ -56 +56 @@
 {
         if (!task->arch.iomap) {
-                uint8_t *map;
-
                 task->arch.iomap = malloc(sizeof(bitmap_t), 0);
-                map = malloc(BITS2BYTES(IO_MEMMAP_PAGES), 0);
-                if(!map)
+                if (task->arch.iomap == NULL)
                         return ENOMEM;
-                bitmap_initialize(task->arch.iomap, map, IO_MEMMAP_PAGES);
+                
+                void *store = malloc(bitmap_size(IO_MEMMAP_PAGES, 0), 0);
+                if (store == NULL)
+                        return ENOMEM;
+                
+                bitmap_initialize(task->arch.iomap, IO_MEMMAP_PAGES, 0, store);
                 bitmap_clear_range(task->arch.iomap, 0, IO_MEMMAP_PAGES);
         }
@@ -69 +71 @@
         size = ALIGN_UP(size + ioaddr - 4 * iopage, PORTS_PER_PAGE);
         bitmap_set_range(task->arch.iomap, iopage, size / 4);
-
+        
         return 0;
 }

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);
 }