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

Timestamp:

2010-02-22T19:40:17Z (14 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

f8f7dba

Parents:

95c4776 (diff), 721d4e85 (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:

Synchronize with head.

File:

• kernel/generic/src/mm/as.c (modified) (1 diff)

kernel/generic/src/mm/as.c

@@ -952 +952 @@
         if (!THREAD)
                 return AS_PF_FAULT;
-                
-        ASSERT(AS);
-
+        
+        if (!AS)
+                return AS_PF_FAULT;
+        
         mutex_lock(&AS->lock);
-        area = find_area_and_lock(AS, page);    
+        area = find_area_and_lock(AS, page);
         if (!area) {
                 /*