Changeset e2650d3 in mainline for kernel/generic/src/main/main.c

Timestamp:

2010-07-20T13:53:36Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

4738d84

Parents:

4d0f97d

Message:

rename PA_overlaps to PA_OVERLAPS
be more tolerant about some cases of overlapping zones (when it is actually not an issue)

File:

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

kernel/generic/src/main/main.c

@@ -147 +147 @@
         size_t i;
         for (i = 0; i < init.cnt; i++) {
-                if (PA_overlaps(config.stack_base, config.stack_size,
+                if (PA_OVERLAPS(config.stack_base, config.stack_size,
                     init.tasks[i].addr, init.tasks[i].size))
                         config.stack_base = ALIGN_UP(init.tasks[i].addr +
@@ -155 +155 @@
         /* Avoid placing stack on top of boot allocations. */
         if (ballocs.size) {
-                if (PA_overlaps(config.stack_base, config.stack_size,
+                if (PA_OVERLAPS(config.stack_base, config.stack_size,
                     ballocs.base, ballocs.size))
                         config.stack_base = ALIGN_UP(ballocs.base +