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

Timestamp:

2011-05-31T22:58:56Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d362410

Parents:

82582e4 (diff), 4ce90544 (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) (2 diffs)

kernel/generic/include/config.h

@@ -36 +36 @@
 #define KERN_CONFIG_H_
 
-#include <typedefs.h>
 #include <arch/mm/page.h>
 
-#define STACK_SIZE  PAGE_SIZE
+#define ONE_FRAME    0
+#define TWO_FRAMES   1
+#define FOUR_FRAMES  2
+
+#define STACK_FRAMES  TWO_FRAMES
+#define STACK_SIZE    ((1 << STACK_FRAMES) << PAGE_WIDTH)
 
 #define CONFIG_INIT_TASKS        32
 #define CONFIG_TASK_NAME_BUFLEN  32
+
+#ifndef __ASM__
+
+#include <typedefs.h>
 
 typedef struct {
@@ -80 +88 @@
 extern ballocs_t ballocs;
 
+#endif /* __ASM__ */
+
 #endif