aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/mpparse.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-08-20 06:18:32 -0400
committerThomas Gleixner <tglx@linutronix.de>2009-08-27 11:12:52 -0400
commit72302142e165313ee58af81bd76708c12b58d7ab (patch)
tree40306eb3d528ce801651983388bb0bb12ca0c5b3 /arch/x86/kernel/mpparse.c
parentfd6c6661492226bb82f422157c535ac573cbecbd (diff)
x86: Move smp_read_mpc_oem to x86_init_ops.
Move smp_read_mpc_oem from quirks to x86_init. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/mpparse.c')
-rw-r--r--arch/x86/kernel/mpparse.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index 04560860a72a..45abdf63edcd 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -293,6 +293,8 @@ static void __init smp_dump_mptable(struct mpc_table *mpc, unsigned char *mpt)
293 1, mpc, mpc->length, 1); 293 1, mpc, mpc->length, 1);
294} 294}
295 295
296void __init default_smp_read_mpc_oem(struct mpc_table *mpc) { }
297
296static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early) 298static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
297{ 299{
298 char str[16]; 300 char str[16];
@@ -314,10 +316,8 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
314 if (early) 316 if (early)
315 return 1; 317 return 1;
316 318
317 if (mpc->oemptr && x86_quirks->smp_read_mpc_oem) { 319 if (mpc->oemptr)
318 struct mpc_oemtable *oem_table = (void *)(long)mpc->oemptr; 320 x86_init.mpparse.smp_read_mpc_oem(mpc);
319 x86_quirks->smp_read_mpc_oem(oem_table, mpc->oemsize);
320 }
321 321
322 /* 322 /*
323 * Now process the configuration blocks. 323 * Now process the configuration blocks.