Changeset 53d5278 in mainline

Timestamp:

2012-03-13T15:24:09Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

96598b8

Parents:

9093c61 (diff), 5608deba (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 with mainline

File:

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

kernel/generic/src/mm/frame.c

@@ -1270 +1270 @@
 /** Adjust bounds of physical memory region according to low/high memory split.
  *
- * @param low[in]       If true, the adujstment is performed to make the region
+ * @param low[in]       If true, the adjustment is performed to make the region
  *                      fit in the low memory. Otherwise the adjustment is
  *                      performed to make the region fit in the high memory.
@@ -1282 +1282 @@
 bool frame_adjust_zone_bounds(bool low, uintptr_t *basep, size_t *sizep)
 {
-        uintptr_t limit = config.identity_size;
+        uintptr_t limit = KA2PA(config.identity_base) + config.identity_size;
 
         if (low) {