Merge branch 'topic/oxygen' into for-linus

[linux-2.6-omap-h63xx.git] / arch / x86 / include / asm / mpspec_def.h

diff --git a/arch/x86/include/asm/mpspec_def.h b/arch/x86/include/asm/mpspec_def.h
index fabf970813bf136ddae8861afd0374c604e5f654..59568bc4767f6c488b9ef32c1a4f30d5e74dff8f 100644 (file)
--- a/arch/x86/include/asm/mpspec_def.h
+++ b/arch/x86/include/asm/mpspec_def.h
@@ -40,16 +40,16 @@ struct intel_mp_floating {
 #define MPC_SIGNATURE "PCMP"
 
 struct mpc_table {
-       char mpc_signature[4];
-       unsigned short mpc_length;      /* Size of table */
-       char mpc_spec;                  /* 0x01 */
-       char mpc_checksum;
-       char mpc_oem[8];
-       char mpc_productid[12];
-       unsigned int mpc_oemptr;        /* 0 if not present */
-       unsigned short mpc_oemsize;     /* 0 if not present */
-       unsigned short mpc_oemcount;
-       unsigned int mpc_lapic; /* APIC address */
+       char signature[4];
+       unsigned short length;          /* Size of table */
+       char spec;                      /* 0x01 */
+       char checksum;
+       char oem[8];
+       char productid[12];
+       unsigned int oemptr;            /* 0 if not present */
+       unsigned short oemsize;         /* 0 if not present */
+       unsigned short oemcount;
+       unsigned int lapic;             /* APIC address */
        unsigned int reserved;
 };
 
@@ -71,19 +71,19 @@ struct mpc_table {
 #define CPU_FAMILY_MASK                0x0F00
 
 struct mpc_cpu {
-       unsigned char mpc_type;
-       unsigned char mpc_apicid;       /* Local APIC number */
-       unsigned char mpc_apicver;      /* Its versions */
-       unsigned char mpc_cpuflag;
-       unsigned int mpc_cpufeature;
-       unsigned int mpc_featureflag;   /* CPUID feature value */
-       unsigned int mpc_reserved[2];
+       unsigned char type;
+       unsigned char apicid;           /* Local APIC number */
+       unsigned char apicver;          /* Its versions */
+       unsigned char cpuflag;
+       unsigned int cpufeature;
+       unsigned int featureflag;       /* CPUID feature value */
+       unsigned int reserved[2];
 };
 
 struct mpc_bus {
-       unsigned char mpc_type;
-       unsigned char mpc_busid;
-       unsigned char mpc_bustype[6];
+       unsigned char type;
+       unsigned char busid;
+       unsigned char bustype[6];
 };
 
 /* List of Bus Type string values, Intel MP Spec. */
@@ -109,21 +109,21 @@ struct mpc_bus {
 #define MPC_APIC_USABLE                0x01
 
 struct mpc_ioapic {
-       unsigned char mpc_type;
-       unsigned char mpc_apicid;
-       unsigned char mpc_apicver;
-       unsigned char mpc_flags;
-       unsigned int mpc_apicaddr;
+       unsigned char type;
+       unsigned char apicid;
+       unsigned char apicver;
+       unsigned char flags;
+       unsigned int apicaddr;
 };
 
 struct mpc_intsrc {
-       unsigned char mpc_type;
-       unsigned char mpc_irqtype;
-       unsigned short mpc_irqflag;
-       unsigned char mpc_srcbus;
-       unsigned char mpc_srcbusirq;
-       unsigned char mpc_dstapic;
-       unsigned char mpc_dstirq;
+       unsigned char type;
+       unsigned char irqtype;
+       unsigned short irqflag;
+       unsigned char srcbus;
+       unsigned char srcbusirq;
+       unsigned char dstapic;
+       unsigned char dstirq;
 };
 
 enum mp_irq_source_types {
@@ -140,23 +140,23 @@ enum mp_irq_source_types {
 #define MP_APIC_ALL    0xFF
 
 struct mpc_lintsrc {
-       unsigned char mpc_type;
-       unsigned char mpc_irqtype;
-       unsigned short mpc_irqflag;
-       unsigned char mpc_srcbusid;
-       unsigned char mpc_srcbusirq;
-       unsigned char mpc_destapic;
-       unsigned char mpc_destapiclint;
+       unsigned char type;
+       unsigned char irqtype;
+       unsigned short irqflag;
+       unsigned char srcbusid;
+       unsigned char srcbusirq;
+       unsigned char destapic;
+       unsigned char destapiclint;
 };
 
 #define MPC_OEM_SIGNATURE "_OEM"
 
-struct mp_config_oemtable {
-       char oem_signature[4];
-       unsigned short oem_length;      /* Size of table */
-       char  oem_rev;                  /* 0x01 */
-       char  oem_checksum;
-       char  mpc_oem[8];
+struct mpc_oemtable {
+       char signature[4];
+       unsigned short length;          /* Size of table */
+       char  rev;                      /* 0x01 */
+       char  checksum;
+       char  mpc[8];
 };
 
 /*