x86: Sanitize smp_record and move it to x86_init_ops

The x86 quirkification introduced an extra ugly hackery with a
variable pointer in the mpparse code. If the pointer is initialized
then it is dereferenced and the variable set to 0 or incremented.

Create a x86_init_ops function and let the affected numaq code
hold the function. Default init is a setup noop.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 11 insertions, 1 deletions

diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index 6c084f2a6c3f..10b297b1881a 100644
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -2,6 +2,14 @@
 #define _ASM_X86_PLATFORM_H
 
 /**
+ * struct x86_init_mpparse - platform specific mpparse ops
+ * @mpc_record:                 platform specific mpc record accounting
+ */
+struct x86_init_mpparse {
+        void (*mpc_record)(unsigned int mode);
+};
+
+/**
  * struct x86_init_resources - platform specific resource related ops
  * @probe_roms:                 probe BIOS roms
  * @reserve_resources:          reserve the standard resources for the
@@ -22,11 +30,13 @@ struct x86_init_resources {
  *
  */
 struct x86_init_ops {
-        struct x86_init_resources resources;
+        struct x86_init_resources       resources;
+        struct x86_init_mpparse         mpparse;
 };
 
 extern struct x86_init_ops x86_init;
 
 extern void x86_init_noop(void);
+extern void x86_init_uint_noop(unsigned int unused);
 
 #endif