x86: xen: move cpu_up functions out of ifdef

arndb · David Vrabel · commit cb5f7e7c1ded · 2016-10-24T15:49:07.000+01:00
Three newly introduced functions are not defined when CONFIG_XEN_PVHVM is disabled, but are still being used: arch/x86/xen/enlighten.c:141:12: warning: ‘xen_cpu_up_prepare’ used but never defined arch/x86/xen/enlighten.c:142:12: warning: ‘xen_cpu_up_online’ used but never defined arch/x86/xen/enlighten.c:143:12: warning: ‘xen_cpu_dead’ used but never defined Fixes: 4d73704 ("xen/x86: Convert to hotplug state machine") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: David Vrabel <david.vrabel@citrix.com>
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
@@ -1838,6 +1838,7 @@ static void __init init_hvm_pv_info(void)
 
 	xen_domain_type = XEN_HVM_DOMAIN;
 }
+#endif
 
 static int xen_cpu_up_prepare(unsigned int cpu)
 {
@@ -1888,6 +1889,7 @@ static int xen_cpu_up_online(unsigned int cpu)
 	return 0;
 }
 
+#ifdef CONFIG_XEN_PVHVM
 #ifdef CONFIG_KEXEC_CORE
 static void xen_hvm_shutdown(void)
 {

Original file line number	Diff line number	Diff line change
`@@ -1838,6 +1838,7 @@ static void __init init_hvm_pv_info(void)`
`1838`	`1838`
`1839`	`1839`	`xen_domain_type = XEN_HVM_DOMAIN;`
`1840`	`1840`	`}`
	`1841`	`+#endif`
`1841`	`1842`
`1842`	`1843`	`static int xen_cpu_up_prepare(unsigned int cpu)`
`1843`	`1844`	`{`
`@@ -1888,6 +1889,7 @@ static int xen_cpu_up_online(unsigned int cpu)`
`1888`	`1889`	`return 0;`
`1889`	`1890`	`}`
`1890`	`1891`
	`1892`	`+#ifdef CONFIG_XEN_PVHVM`
`1891`	`1893`	`#ifdef CONFIG_KEXEC_CORE`
`1892`	`1894`	`static void xen_hvm_shutdown(void)`
`1893`	`1895`	`{`