Changeset 98e4507 in mainline for kernel/generic/src/mm/as.c

Timestamp:

2011-05-20T01:13:40Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5c460cc

Parents:

a0bb65af (diff), 326bf65 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/generic/src/mm/as.c (modified) (2 diffs)

kernel/generic/src/mm/as.c

@@ -482 +482 @@
         
         /*
-         * Search the leaf node and the righmost record of its left neighbour
+         * Search the leaf node and the rightmost record of its left neighbour
          * to find out whether this is a miss or va belongs to an address
          * space area found there.
@@ -494 +494 @@
                 
                 mutex_lock(&area->lock);
-                
-                if ((area->base <= va) &&
-                    (va < area->base + (area->pages << PAGE_WIDTH)))
+
+                size_t size = area->pages << PAGE_WIDTH;
+                if ((area->base <= va) && (va <= area->base + (size - 1)))
                         return area;