Changeset 8cbf1c3 in mainline for kernel/arch/arm32/src

Timestamp:

2013-09-09T23:13:10Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e2a0d76

Parents:

c67dbd6

Message:

prepare the public API of the frame allocator for the new backend
remove FRAME_KA (can be easily implemented explicitly)

Location:

kernel/arch/arm32/src

Files:

• mm/page.c (modified) (1 diff)
• ras.c (modified) (1 diff)

kernel/arch/arm32/src/mm/page.c

@@ -69 +69 @@
 #ifdef HIGH_EXCEPTION_VECTORS
         /* Create mapping for exception table at high offset */
-        uintptr_t ev_frame = (uintptr_t) frame_alloc(ONE_FRAME, FRAME_NONE);
+        uintptr_t ev_frame = frame_alloc(ONE_FRAME, FRAME_NONE, 0);
         page_mapping_insert(AS_KERNEL, EXC_BASE_ADDRESS, ev_frame, flags);
 #else

kernel/arch/arm32/src/ras.c

@@ -53 +53 @@
         uintptr_t frame;
 
-        frame = (uintptr_t) frame_alloc(ONE_FRAME,
-            FRAME_ATOMIC | FRAME_HIGHMEM);
+        frame = frame_alloc(ONE_FRAME,
+            FRAME_ATOMIC | FRAME_HIGHMEM, 0);
         if (!frame)
-                frame = (uintptr_t) frame_alloc(ONE_FRAME, FRAME_LOWMEM);
+                frame = frame_alloc(ONE_FRAME, FRAME_LOWMEM, 0);
         ras_page = (uintptr_t *) km_map(frame,
             PAGE_SIZE, PAGE_READ | PAGE_WRITE | PAGE_USER | PAGE_CACHEABLE);