← Back to branch summary

~jakub/helenos/ia64-revival

« back to all changes in this revision

Viewing changes to kernel/arch/ia32/src/mm/page.c

  • Committer: Jakub Jermar
  • Date: 2011-04-13 14:45:41 UTC
  • mfrom: (527.1.397 main-clone)
  • Revision ID: jakub@jermar.eu-20110413144541-x0j3r1zxqhsljx1o
Merge mainline changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
kernel/arch/ia32/src/mm/page.c
81
81
uintptr_t hw_map(uintptr_t physaddr, size_t size)
82
82
{
83
83
        if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
84
 
                panic("Unable to map physical memory %p (%d bytes).", physaddr, size);
 
84
                panic("Unable to map physical memory %p (%zu bytes).",
 
85
                    (void *) physaddr, size);
85
86
        
86
87
        uintptr_t virtaddr = PA2KA(last_frame);
87
88
        pfn_t i;
114
115
        
115
116
        if (as_page_fault(page, access, istate) == AS_PF_FAULT) {
116
117
                fault_if_from_uspace(istate, "Page fault: %#x.", page);
117
 
                panic_memtrap(istate, access, page, "Page fault.");
 
118
                panic_memtrap(istate, access, page, NULL);
118
119
        }
119
120
}
120
121