UPSTREAM: CPU: Move SMM prototypes under x86

BUG=None
BRANCH=None
TEST=None

Signed-off-by: Kysti Mlkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/17732
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins)

Change-Id: Iefbc17dcfcf312338d94b2c2945c7fac3b23bff6
Reviewed-on: https://chromium-review.googlesource.com/417945
Commit-Ready: Furquan Shaikh <furquan@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

src/arch/x86/include/arch/cpu.h

@@ -163,6 +163,10 @@ int cpu_cpuid_extended_level(void);
 int cpu_have_cpuid(void);
 int cpu_phys_address_size(void);
 
+void smm_init(void);
+void smm_lock(void);
+void smm_setup_structures(void *gnvs, void *tcg, void *smi1);
+
 #ifndef __SIMPLE_DEVICE__
 
 struct device;

src/include/cpu/cpu.h

@@ -9,10 +9,6 @@ struct bus;
 void initialize_cpus(struct bus *cpu_bus);
 void asmlinkage secondary_cpu_init(unsigned int cpu_index);
 
-void smm_init(void);
-void smm_lock(void);
-void smm_setup_structures(void *gnvs, void *tcg, void *smi1);
-
 #define __cpu_driver __attribute__ ((used,__section__(".rodata.cpu_driver")))
 #ifndef __SIMPLE_DEVICE__
 /** start of compile time generated pci driver array */

src/mainboard/siemens/sitemp_g1p1/mainboard.c

@@ -760,7 +760,7 @@ static void detect_hw_variant( device_t dev )
 	}
 }
 
-static void smm_lock( void )
+void smm_lock(void)
 {
 	/* LOCK the SMM memory window and enable normal SMM.
 	 * After running this function, only a full reset can