Changeset 7943c43 in mainline for kernel/generic/src/proc/program.c

Timestamp:

2012-01-16T22:45:38Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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) (1 diff)

kernel/generic/src/proc/program.c

@@ -87 +87 @@
          * Create the stack address space area.
          */
+        uintptr_t virt = USTACK_ADDRESS;
         as_area_t *area = as_area_create(as,
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE,
-            STACK_SIZE, USTACK_ADDRESS, AS_AREA_ATTR_NONE,
-            &anon_backend, NULL);
+            STACK_SIZE, AS_AREA_ATTR_NONE, &anon_backend, NULL, &virt, 0);
         if (!area)
                 return ENOMEM;