From: Kees Jongenburger <kees.jongenburger@gmail.com>
Date: Wed, 25 Sep 2013 08:36:07 +0000 (+0200)
Subject: arm:allow to lookup physical addresses of sections.
X-Git-Tag: v3.3.0~786
X-Git-Url: http://zhaoyanbai.com/repos/CHANGES?a=commitdiff_plain;h=refs%2Fchanges%2F43%2F843%2F2;p=minix.git

arm:allow to lookup physical addresses of sections.

Change-Id: If4716b81cceee5d8b30d5f103b772b0ac99fc807
---

diff --git a/kernel/arch/earm/memory.c b/kernel/arch/earm/memory.c
index 6a9334d5c..f1afdcab0 100644
--- a/kernel/arch/earm/memory.c
+++ b/kernel/arch/earm/memory.c
@@ -309,17 +309,17 @@ int vm_lookup(const struct proc *proc, const vir_bytes virtual,
 	assert(pde >= 0 && pde < ARM_VM_DIR_ENTRIES);
 	pde_v = phys_get32((u32_t) (root + pde));
 
-	if(!(pde_v & ARM_VM_PDE_PRESENT)) {
+	if(! ((pde_v & ARM_VM_PDE_PRESENT) 
+		|| (pde_v & ARM_VM_SECTION_PRESENT)
+	     )) {
 		return EFAULT;
 	}
 
-	/* We don't expect to ever see this. 
-	 * LSC Impossible with the previous test.
 	if(pde_v & ARM_VM_SECTION) {
 		*physical = pde_v & ARM_VM_SECTION_MASK;
 		if(ptent) *ptent = pde_v;
 		*physical += virtual & ARM_VM_OFFSET_MASK_1MB;
-	} else */ {
+	} else  {
 		/* Retrieve page table entry. */
 		pt = (u32_t *) (pde_v & ARM_VM_PDE_MASK);
 		assert(!((u32_t) pt % ARM_PAGETABLE_SIZE));