Fix overlap algorithm in cortex-m mpu

tock · Sep 18, 2018 · 9f66bd2 · 9f66bd2
1 parent 084b4e5
commit 9f66bd2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/arch/cortex-m4/src/mpu.rs b/arch/cortex-m4/src/mpu.rs
@@ -265,17 +265,11 @@ impl CortexMRegion {
             None => return false,
         };
 
-        // Start of region overlaps
-        if other_start <= region_start && region_start < other_end {
-            return true;
+        if region_start < other_end && other_start < region_end {
+            true
+        } else {
+            false
         }
-
-        // End of region overlaps
-        if other_start < region_end && region_end <= other_end {
-            return true;
-        }
-
-        false
     }
 }
 

diff --git a/boards/hail/Cargo.lock b/boards/hail/Cargo.lock