From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 7 Apr 2008 11:11:09 +0000 (+0200)
Subject: x86: don't set io apic features if io-apic is not enabled, fix
X-Git-Tag: v2.6.26-rc1~1154^2~35
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ba1ce61ff226bddebd2101a29fe56b4664ef7cec;p=linux-2.6-omap-h63xx.git

x86: don't set io apic features if io-apic is not enabled, fix

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index 09cb7781368..44f52f623fd 100644
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -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: