Changeset 38f6add in mainline

Timestamp:

2009-01-04T13:58:11Z (16 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:

• page.c (modified) (1 diff)
• tlb.c (modified) (1 diff)

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

@@ -269 +269 @@
 }
 
-extern uintptr_t last_frame;
-
-uintptr_t hw_map(uintptr_t physaddr, size_t size)
-{
-        if (last_frame + ALIGN_UP(size, PAGE_SIZE) >
-            KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
-                panic("Unable to map physical memory %p (%d bytes)", physaddr,
-                    size)
-        
-        uintptr_t virtaddr = PA2KA(last_frame);
-        pfn_t i;
-        for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++) {
-                uintptr_t addr = PFN2ADDR(i);
-                page_mapping_insert(AS_KERNEL, virtaddr + addr, physaddr + addr,
-                    PAGE_NOT_CACHEABLE | PAGE_WRITE);
-        }
-        
-        last_frame = ALIGN_UP(last_frame + size, FRAME_SIZE);
-        
-        return virtaddr;
+uintptr_t hw_map(uintptr_t physaddr, size_t size __attribute__ ((unused)))
+{
+        /* This is a dirty hack. */
+        return PA2KA(physaddr);
 }
 

kernel/arch/ia64/src/mm/tlb.c

@@ -483 +483 @@
 {
         if (TASK->arch.iomap)
-                return bitmap_get(TASK->arch.iomap,page);
+                return bitmap_get(TASK->arch.iomap, page);
         else
                 return 0;