Changeset 99c2c69e in mainline for kernel/generic/include/config.h

Timestamp:

2013-09-13T00:36:30Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

67fbd5e

Parents:

7f84430 (diff), 11d41be5 (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:

mainline changes

File:

• kernel/generic/include/config.h (modified) (3 diffs)

kernel/generic/include/config.h

@@ -37 +37 @@
 
 #include <arch/mm/page.h>
+#include <macros.h>
 
-#define ONE_FRAME    0
-#define TWO_FRAMES   1
-#define FOUR_FRAMES  2
+#define STACK_FRAMES  2
+#define STACK_SIZE    FRAMES2SIZE(STACK_FRAMES)
 
-#define STACK_FRAMES  TWO_FRAMES
-#define STACK_SIZE    ((1 << STACK_FRAMES) << PAGE_WIDTH)
-
-#define STACK_SIZE_USER (1 * 1024 * 1024)
+#define STACK_SIZE_USER  (1 * 1024 * 1024)
 
 #define CONFIG_INIT_TASKS        32
@@ -97 +94 @@
         /** Size of initial stack. */
         size_t stack_size;
-
+        
         bool identity_configured;
         /** Base address of the kernel identity mapped memory. */
@@ -103 +100 @@
         /** Size of the kernel identity mapped memory. */
         size_t identity_size;
-
-        bool non_identity_configured;   
-
+        
+        bool non_identity_configured;
+        
         /** End of physical memory. */
         uint64_t physmem_end;