Changeset 96cd5b4 in mainline for kernel/generic/include/config.h

Timestamp:

2012-01-04T13:37:10Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

9957a97

Parents:

ecf823a (diff), c520034 (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 with mainline

File:

• kernel/generic/include/config.h (modified) (1 diff)

kernel/generic/include/config.h

@@ -74 +74 @@
 
 typedef struct {
-        unsigned int cpu_count;      /**< Number of processors detected. */
-        volatile size_t cpu_active;  /**< Number of processors that are up and running. */
+        /** Number of processors detected. */
+        unsigned int cpu_count;
+        /** Number of processors that are up and running. */
+        volatile size_t cpu_active;
         
         uintptr_t base;
-        size_t kernel_size;          /**< Size of memory in bytes taken by kernel and stack */
+        /** Size of memory in bytes taken by kernel and stack. */
+        size_t kernel_size;
         
-        uintptr_t stack_base;        /**< Base adddress of initial stack */
-        size_t stack_size;           /**< Size of initial stack */
+        /** Base adddress of initial stack. */
+        uintptr_t stack_base;
+        /** Size of initial stack. */
+        size_t stack_size;
+
+        bool identity_configured;
+        /** Base address of the kernel identity mapped memory. */
+        uintptr_t identity_base;
+        /** Size of the kernel identity mapped memory. */
+        size_t identity_size;
+
+        bool non_identity_configured;   
+
+        /** End of physical memory. */
+        uint64_t physmem_end;
 } config_t;