Changeset 86c71de in mainline for kernel/arch/arm32/src/mm/page.c

Timestamp:

2012-01-21T12:57:55Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

eaa0c3f

Parents:

47a89fe (diff), e86b8f0 (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 with mainline

File:

• kernel/arch/arm32/src/mm/page.c (modified) (1 diff)

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

@@ -65 +65 @@
                 page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
         
+#ifdef HIGH_EXCEPTION_VECTORS
         /* Create mapping for exception table at high offset */
-#ifdef HIGH_EXCEPTION_VECTORS
-        // XXX: fixme to use proper non-identity page
-        void *virtaddr = frame_alloc(ONE_FRAME, FRAME_KA);
-        page_mapping_insert(AS_KERNEL, EXC_BASE_ADDRESS, KA2PA(virtaddr),
-            flags);
+        uintptr_t ev_frame = (uintptr_t) frame_alloc(ONE_FRAME, FRAME_NONE);
+        page_mapping_insert(AS_KERNEL, EXC_BASE_ADDRESS, ev_frame, flags);
 #else
 #error "Only high exception vector supported now"
 #endif
-        cur = ALIGN_DOWN(0x50008010, FRAME_SIZE);
-        page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
 
         page_table_unlock(AS_KERNEL, true);