Merge branch 'linus' into x86/boot, to resolve conflict

[linux-2.6-microblaze.git] / arch / x86 / include / asm / x86_init.h

diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index c878616..b89b40f 100644 (file)
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -2,8 +2,6 @@
 #ifndef _ASM_X86_PLATFORM_H
 #define _ASM_X86_PLATFORM_H
 
-#include <asm/bootparam.h>
-
 struct ghcb;
 struct mpc_bus;
 struct mpc_cpu;
@@ -15,13 +13,15 @@ struct irq_domain;
 /**
  * struct x86_init_mpparse - platform specific mpparse ops
  * @setup_ioapic_ids:          platform specific ioapic id override
- * @find_smp_config:           find the smp configuration
- * @get_smp_config:            get the smp configuration
+ * @find_mptable:              Find MPTABLE early to reserve the memory region
+ * @early_parse_smp_cfg:       Parse the SMP configuration data early before initmem_init()
+ * @parse_smp_cfg:             Parse the SMP configuration data
  */
 struct x86_init_mpparse {
        void (*setup_ioapic_ids)(void);
-       void (*find_smp_config)(void);
-       void (*get_smp_config)(unsigned int early);
+       void (*find_mptable)(void);
+       void (*early_parse_smp_cfg)(void);
+       void (*parse_smp_cfg)(void);
 };
 
 /**