Changeset 544a2e4 in mainline for kernel/generic/src/proc/program.c

Timestamp:

2011-05-30T21:37:43Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7b712b60

Parents:

18ba2e4f (diff), 0743493a (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/proc/program.c (modified) (2 diffs)

kernel/generic/src/proc/program.c

@@ -54 +54 @@
 #include <proc/program.h>
 
-#ifndef LOADED_PROG_STACK_PAGES_NO
-#define LOADED_PROG_STACK_PAGES_NO 1
-#endif
-
 /**
  * Points to the binary image used as the program loader. All non-initial
@@ -90 +86 @@
         
         /*
-         * Create the data address space area.
+         * Create the stack address space area.
          */
         as_area_t *area = as_area_create(as,
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE,
-            LOADED_PROG_STACK_PAGES_NO * PAGE_SIZE, USTACK_ADDRESS,
-            AS_AREA_ATTR_NONE, &anon_backend, NULL);
+            STACK_SIZE, USTACK_ADDRESS, AS_AREA_ATTR_NONE,
+            &anon_backend, NULL);
         if (!area)
                 return ENOMEM;