Changeset 5f83634 in mainline for kernel/arch/ia64/src/mm/tlb.c
- Timestamp:
- 2010-07-12T16:45:05Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 6b1a85c
- Parents:
- bee2d4c (diff), 8078180 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/arch/ia64/src/mm/tlb.c
rbee2d4c r5f83634 500 500 if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) { 501 501 fault_if_from_uspace(istate, "Page fault at %p.", va); 502 panic_memtrap(istate, PF_ACCESS_EXEC, va, 503 "Page fault."); 502 panic_memtrap(istate, PF_ACCESS_EXEC, va, NULL); 504 503 } 505 504 } … … 622 621 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) { 623 622 fault_if_from_uspace(istate, "Page fault at %p.", va); 624 panic_memtrap(istate, PF_ACCESS_READ, va, 625 "Page fault."); 623 panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, NULL); 626 624 } 627 625 } … … 671 669 if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) { 672 670 fault_if_from_uspace(istate, "Page fault at %p.", va); 673 panic_memtrap(istate, PF_ACCESS_WRITE, va, 674 "Page fault."); 671 panic_memtrap(istate, PF_ACCESS_WRITE, va, NULL); 675 672 } 676 673 } … … 708 705 if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) { 709 706 fault_if_from_uspace(istate, "Page fault at %p.", va); 710 panic_memtrap(istate, PF_ACCESS_EXEC, va, 711 "Page fault."); 707 panic_memtrap(istate, PF_ACCESS_EXEC, va, NULL); 712 708 } 713 709 } … … 745 741 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) { 746 742 fault_if_from_uspace(istate, "Page fault at %p.", va); 747 panic_memtrap(istate, PF_ACCESS_READ, va, 748 "Page fault."); 743 panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, NULL); 749 744 } 750 745 } … … 778 773 if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) { 779 774 fault_if_from_uspace(istate, "Page fault at %p.", va); 780 panic_memtrap(istate, PF_ACCESS_WRITE, va, "Page fault.");775 panic_memtrap(istate, PF_ACCESS_WRITE, va, NULL); 781 776 } 782 777 page_table_unlock(AS, true); … … 818 813 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) { 819 814 fault_if_from_uspace(istate, "Page fault at %p.", va); 820 panic_memtrap(istate, PF_ACCESS_READ, va, 821 "Page fault."); 815 panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, NULL); 822 816 } 823 817 }
Note:
See TracChangeset
for help on using the changeset viewer.