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


Ignore:
Timestamp:
2010-07-12T10:53:30Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bd11d3e
Parents:
c40e6ef (diff), bee2d4c (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:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/ia32/src/mm/page.c

    rc40e6ef rbd48f4c  
    115115        if (as_page_fault(page, access, istate) == AS_PF_FAULT) {
    116116                fault_if_from_uspace(istate, "Page fault: %#x.", page);
    117                
    118                 decode_istate(istate);
    119                 printf("page fault address: %#lx\n", page);
    120                 panic("Page fault.");
     117                panic_memtrap(istate, access, page, "Page fault.");
    121118        }
    122119}
Note: See TracChangeset for help on using the changeset viewer.