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

Timestamp:

2013-07-24T17:42:25Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:

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

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

@@ -84 +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)
@@ -97 +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);
 }