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

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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) (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
 #define CONFIG_TASK_NAME_BUFLEN  32
 #define CONFIG_TASK_ARGUMENTS_BUFLEN 64
-
-/**
- * Maximum buffer size allowed for IPC_M_DATA_WRITE and IPC_M_DATA_READ
- * requests.
- */
-#define DATA_XFER_LIMIT  (64 * 1024)
 
 #ifndef __ASM__
@@ -97 +88 @@
         /** Size of initial stack. */
         size_t stack_size;
-
+        
         bool identity_configured;
         /** Base address of the kernel identity mapped memory. */
@@ -103 +94 @@
         /** 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;