Changeset bd48f4c in mainline for kernel/generic/include/config.h

Timestamp:

2010-07-12T10:53:30Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd11d3e

Parents:

c40e6ef (diff), bee2d4c (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/include/config.h (modified) (1 diff)

kernel/generic/include/config.h

@@ -70 +70 @@
         
         uintptr_t base;
-        size_t kernel_size;           /**< Size of memory in bytes taken by kernel and stack */
+        size_t kernel_size;          /**< Size of memory in bytes taken by kernel and stack */
         
-        uintptr_t stack_base;         /**< Base adddress of initial stack */
-        size_t stack_size;            /**< Size of initial stack */
+        uintptr_t stack_base;        /**< Base adddress of initial stack */
+        size_t stack_size;           /**< Size of initial stack */
 } config_t;