Changeset 38f6add in mainline


Ignore:
Timestamp:
2009-01-04T13:58:11Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
44ff4fb
Parents:
8ce14e3
Message:

Replace the disfunct hw_map() with a functional dirty hack.

Location:
kernel/arch/ia64/src/mm
Files:
2 edited

Legend:

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

    r8ce14e3 r38f6add  
    269269}
    270270
    271 extern uintptr_t last_frame;
    272 
    273 uintptr_t hw_map(uintptr_t physaddr, size_t size)
    274 {
    275         if (last_frame + ALIGN_UP(size, PAGE_SIZE) >
    276             KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
    277                 panic("Unable to map physical memory %p (%d bytes)", physaddr,
    278                     size)
    279        
    280         uintptr_t virtaddr = PA2KA(last_frame);
    281         pfn_t i;
    282         for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++) {
    283                 uintptr_t addr = PFN2ADDR(i);
    284                 page_mapping_insert(AS_KERNEL, virtaddr + addr, physaddr + addr,
    285                     PAGE_NOT_CACHEABLE | PAGE_WRITE);
    286         }
    287        
    288         last_frame = ALIGN_UP(last_frame + size, FRAME_SIZE);
    289        
    290         return virtaddr;
     271uintptr_t hw_map(uintptr_t physaddr, size_t size __attribute__ ((unused)))
     272{
     273        /* This is a dirty hack. */
     274        return PA2KA(physaddr);
    291275}
    292276
  • kernel/arch/ia64/src/mm/tlb.c

    r8ce14e3 r38f6add  
    483483{
    484484        if (TASK->arch.iomap)
    485                 return bitmap_get(TASK->arch.iomap,page);
     485                return bitmap_get(TASK->arch.iomap, page);
    486486        else
    487487                return 0;
Note: See TracChangeset for help on using the changeset viewer.