Index: kernel/genarch/src/acpi/acpi.c
===================================================================
--- kernel/genarch/src/acpi/acpi.c	(revision 20de14de7bf488f39216e847fba886d5d3e934fa)
+++ kernel/genarch/src/acpi/acpi.c	(revision bf3dd35e1dbbdb751e833d8750fe09a54f590040)
@@ -102,9 +102,9 @@
 
 	/* Start with mapping the header only. */
-	vhdr = (struct acpi_sdt_header *) km_map_structure((uintptr_t) psdt,
+	vhdr = (struct acpi_sdt_header *) km_map((uintptr_t) psdt,
 	    sizeof(struct acpi_sdt_header), PAGE_READ | PAGE_NOT_CACHEABLE); 
 
 	/* Now we can map the entire structure. */
-	vsdt = (struct acpi_sdt_header *) km_map_structure((uintptr_t) psdt,
+	vsdt = (struct acpi_sdt_header *) km_map((uintptr_t) psdt,
 	    vhdr->length, PAGE_WRITE | PAGE_NOT_CACHEABLE);
 	
Index: kernel/generic/include/mm/km.h
===================================================================
--- kernel/generic/include/mm/km.h	(revision 20de14de7bf488f39216e847fba886d5d3e934fa)
+++ kernel/generic/include/mm/km.h	(revision bf3dd35e1dbbdb751e833d8750fe09a54f590040)
@@ -50,5 +50,4 @@
 
 extern uintptr_t km_map(uintptr_t, size_t, unsigned int);
-extern uintptr_t km_map_structure(uintptr_t, size_t, unsigned int);
 
 extern uintptr_t km_temporary_page_get(uintptr_t *, frame_flags_t);
Index: kernel/generic/src/mm/km.c
===================================================================
--- kernel/generic/src/mm/km.c	(revision 20de14de7bf488f39216e847fba886d5d3e934fa)
+++ kernel/generic/src/mm/km.c	(revision bf3dd35e1dbbdb751e833d8750fe09a54f590040)
@@ -124,5 +124,6 @@
 }
 
-uintptr_t km_map(uintptr_t paddr, size_t size, unsigned int flags)
+static uintptr_t
+km_map_aligned(uintptr_t paddr, size_t size, unsigned int flags)
 {
 	uintptr_t vaddr;
@@ -145,10 +146,11 @@
 }
 
-uintptr_t km_map_structure(uintptr_t paddr, size_t size, unsigned int flags)
+uintptr_t km_map(uintptr_t paddr, size_t size, unsigned int flags)
 {
 	size_t offs = paddr - ALIGN_DOWN(paddr, FRAME_SIZE); 
 	uintptr_t page;
 
-	page = km_map(ALIGN_DOWN(paddr, FRAME_SIZE), size + offs, flags);
+	page = km_map_aligned(ALIGN_DOWN(paddr, FRAME_SIZE), size + offs,
+	    flags);
 	return page + offs;
 }