Changeset bd48f4c in mainline for kernel/arch/ia32/include/smp/mps.h

Timestamp:

2010-07-12T10:53:30Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd11d3e

Parents:

c40e6ef (diff), bee2d4c (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/arch/ia32/include/smp/mps.h (modified) (6 diffs)

kernel/arch/ia32/include/smp/mps.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ia32    
+/** @addtogroup ia32
  * @{
  */
@@ -41 +41 @@
 #include <arch/smp/smp.h>
 
-#define CT_EXT_ENTRY_TYPE               0
-#define CT_EXT_ENTRY_LEN                1
+#define CT_EXT_ENTRY_TYPE  0
+#define CT_EXT_ENTRY_LEN   1
 
 struct mps_fs {
@@ -70 +70 @@
         uint16_t ext_table_length;
         uint8_t ext_table_checksum;
-        uint8_t xxx;
+        uint8_t reserved;
         uint8_t base_table[0];
 } __attribute__ ((packed));
@@ -81 +81 @@
         uint8_t cpu_signature[4];
         uint32_t feature_flags;
-        uint32_t xxx[2];
+        uint32_t reserved[2];
 } __attribute__ ((packed));
 
@@ -102 +102 @@
         uint8_t intr_type;
         uint8_t poel;
-        uint8_t xxx;
+        uint8_t reserved;
         uint8_t src_bus_id;
         uint8_t src_bus_irq;
@@ -113 +113 @@
         uint8_t intr_type;
         uint8_t poel;
-        uint8_t xxx;
+        uint8_t reserved;
         uint8_t src_bus_id;
         uint8_t src_bus_irq;