diff --git a/src/system/boot/arch/arm/arch_mmu.cpp b/src/system/boot/arch/arm/arch_mmu.cpp
index 8f0a7d390c..c72b2c7698 100644
--- a/src/system/boot/arch/arm/arch_mmu.cpp
+++ b/src/system/boot/arch/arm/arch_mmu.cpp
@@ -128,7 +128,6 @@ static const size_t kMaxKernelSize = 0x200000;		// 2 MB for the kernel
 
 static addr_t sNextPhysicalAddress = 0; //will be set by mmu_init
 static addr_t sNextVirtualAddress = KERNEL_BASE + kMaxKernelSize;
-static addr_t sMaxVirtualAddress = KERNEL_BASE + kMaxKernelSize;
 
 static addr_t sNextPageTableAddress = 0;
 //the page directory is in front of the pagetable
@@ -397,17 +396,6 @@ map_page(addr_t virtualAddress, addr_t physicalAddress, uint32 flags)
 			(void *)virtualAddress);
 	}
 
-	if (virtualAddress >= sMaxVirtualAddress) {
-		// we need to add a new page table
-		add_page_table(sMaxVirtualAddress);
-		sMaxVirtualAddress += B_PAGE_SIZE * 256;
-
-		if (virtualAddress >= sMaxVirtualAddress) {
-			panic("map_page: asked to map a page to %p\n",
-				(void *)virtualAddress);
-		}
-	}
-
 	physicalAddress &= ~(B_PAGE_SIZE - 1);
 
 	// map the page to the correct page table