x86: don't set io apic features if io-apic is not enabled, fix
authorIngo Molnar <mingo@elte.hu>
Mon, 7 Apr 2008 11:11:09 +0000 (13:11 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 17 Apr 2008 15:41:34 +0000 (17:41 +0200)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/mpparse_32.c

index 09cb77813680ff5a2e73f9b9a32f0ff0de123d95..44f52f623fd683887b97c951297cf382da42e934 100644 (file)
@@ -429,9 +429,9 @@ static int __init smp_read_mpc(struct mp_config_table *mpc)
                                struct mpc_config_ioapic *m=
                                        (struct mpc_config_ioapic *)mpt;
                                MP_ioapic_info(m);
-                               mpt+=sizeof(*m);
-                               count+=sizeof(*m);
 #endif
+                               mpt+=sizeof(struct mpc_config_ioapic);
+                               count+=sizeof(struct mpc_config_ioapic);
                                break;
                        }
                        case MP_INTSRC:
@@ -441,9 +441,9 @@ static int __init smp_read_mpc(struct mp_config_table *mpc)
                                        (struct mpc_config_intsrc *)mpt;
 
                                MP_intsrc_info(m);
-                               mpt+=sizeof(*m);
-                               count+=sizeof(*m);
 #endif
+                               mpt+=sizeof(struct mpc_config_intsrc);
+                               count+=sizeof(struct mpc_config_intsrc);
                                break;
                        }
                        case MP_LINTSRC: