2 files changed, 10 insertions, 10 deletions

diff --git a/arch/x86/include/asm/mpspec_def.h b/arch/x86/include/asm/mpspec_def.h
index 60ba5439e9f2..6ea62ea2dc21 100644
--- a/arch/x86/include/asm/mpspec_def.h
+++ b/arch/x86/include/asm/mpspec_def.h
@@ -152,11 +152,11 @@ struct mpc_lintsrc {
 #define MPC_OEM_SIGNATURE "_OEM"
 
 struct mpc_oemtable {
-        char oem_signature[4];
-        unsigned short oem_length;      /* Size of table */
-        char  oem_rev;                  /* 0x01 */
-        char  oem_checksum;
-        char  mpc_oem[8];
+        char signature[4];
+        unsigned short length;          /* Size of table */
+        char  rev;                      /* 0x01 */
+        char  checksum;
+        char  mpc[8];
 };
 
 /*
diff --git a/arch/x86/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c
index 8242fef6d0e5..f2191d4f2717 100644
--- a/arch/x86/kernel/numaq_32.c
+++ b/arch/x86/kernel/numaq_32.c
@@ -194,18 +194,18 @@ static void __init smp_read_mpc_oem(struct mpc_oemtable *oemtable,
         mpc_record = 0;
         printk(KERN_INFO "Found an OEM MPC table at %8p - parsing it ... \n",
                oemtable);
-        if (memcmp(oemtable->oem_signature, MPC_OEM_SIGNATURE, 4)) {
+        if (memcmp(oemtable->signature, MPC_OEM_SIGNATURE, 4)) {
                 printk(KERN_WARNING
                        "SMP mpc oemtable: bad signature [%c%c%c%c]!\n",
-                       oemtable->oem_signature[0], oemtable->oem_signature[1],
-                       oemtable->oem_signature[2], oemtable->oem_signature[3]);
+                       oemtable->signature[0], oemtable->signature[1],
+                       oemtable->signature[2], oemtable->signature[3]);
                 return;
         }
-        if (mpf_checksum((unsigned char *)oemtable, oemtable->oem_length)) {
+        if (mpf_checksum((unsigned char *)oemtable, oemtable->length)) {
                 printk(KERN_WARNING "SMP oem mptable: checksum error!\n");
                 return;
         }
-        while (count < oemtable->oem_length) {
+        while (count < oemtable->length) {
                 switch (*oemptr) {
                 case MP_TRANSLATION:
                         {