Changeset 5c7be3e in mainline

Timestamp:

2016-06-18T16:17:49Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6a66923

Parents:

554e70f

Message:

When km_temporary_page_get() cannot allocate a page for a high-memory
frame, fallback to allocating a low-memory frame.

File:

• kernel/generic/src/mm/km.c (modified) (1 diff)

kernel/generic/src/mm/km.c

@@ -248 +248 @@
          */
         uintptr_t page;
-        uintptr_t frame =
-            frame_alloc(1, FRAME_HIGHMEM | FRAME_ATOMIC | flags, 0);
+        uintptr_t frame;
+
+        frame = frame_alloc(1, FRAME_HIGHMEM | FRAME_ATOMIC | flags, 0);
         if (frame) {
                 page = km_map(frame, PAGE_SIZE,
                     PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE);
-                
-                // FIXME
-                ASSERT(page);
+                if (!page) {    
+                        frame_free(frame, 1);
+                        goto lowmem;
+                }
         } else {
+lowmem:
                 frame = frame_alloc(1, FRAME_LOWMEM | flags, 0);
                 if (!frame)