Changeset bb68433 in mainline for generic/src/main/main.c

Timestamp:

2006-02-08T22:58:06Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

7e4e532

Parents:

85dc2e7

Message:

Changed malloc to include second parameter and documented
recommended usage.
Added zone merging, made ia32 & amd64 to merge found zones.

File:

• generic/src/main/main.c (modified) (1 diff)

generic/src/main/main.c

@@ -116 +116 @@
         stackaddr = config.base + config.kernel_size;
         /* Avoid placing kernel on top of init */
-        if (overlaps(stackaddr,stackaddr+CONFIG_STACK_SIZE,
-                     config.init_addr, config.init_addr+config.init_size)) {
+        if (overlaps(stackaddr,CONFIG_STACK_SIZE,
+                     config.init_addr, config.init_size)) {
                 
                 stackaddr = ALIGN_UP(config.init_addr+config.init_size,