Changeset 4c53333 in mainline for kernel/arch/ia32/src/mm/page.c

Timestamp:

2013-07-11T08:21:10Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (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

File:

• kernel/arch/ia32/src/mm/page.c (modified) (3 diffs)

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

@@ -71 +71 @@
         for (cur = 0; cur < min(config.identity_size, config.physmem_end);
             cur += FRAME_SIZE) {
-                flags = PAGE_CACHEABLE | PAGE_WRITE;
-                if ((PA2KA(cur) >= config.base) &&
-                    (PA2KA(cur) < config.base + config.kernel_size))
-                        flags |= PAGE_GLOBAL;
+                flags = PAGE_GLOBAL | PAGE_CACHEABLE | PAGE_WRITE | PAGE_READ;
                 page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
         }
@@ -87 +84 @@
 void page_fault(unsigned int n __attribute__((unused)), istate_t *istate)
 {
-        uintptr_t page;
+        uintptr_t badvaddr;
         pf_access_t access;
         
-        page = read_cr2();
+        badvaddr = read_cr2();
                 
         if (istate->error_word & PFERR_CODE_RSVD)
@@ -100 +97 @@
                 access = PF_ACCESS_READ;
         
-        if (as_page_fault(page, access, istate) == AS_PF_FAULT) {
-                fault_if_from_uspace(istate, "Page fault: %#x.", page);
-                panic_memtrap(istate, access, page, NULL);
-        }
+        (void) as_page_fault(badvaddr, access, istate);
 }