Changeset 46c20c8 in mainline for kernel/generic/include/config.h

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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 <arch/types.h>
+#include <typedefs.h>
 #include <arch/mm/page.h>
 
@@ -66 +66 @@
 
 typedef struct {
-        size_t cpu_count;            /**< Number of processors detected. */
+        unsigned int cpu_count;      /**< Number of processors detected. */
         volatile size_t cpu_active;  /**< Number of processors that are up and running. */
         
         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;