Skip to contentSkip to conversation

x86: xen: move cpu_up functions out of ifdef

PATCH In review Arnd Bergmann 2 participants 3 messages Oct 12, 2016

Subsystems (2)
x86 Xen hypervisor x86
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 x86: xen: move cpu_up functions out of ifdef

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 4d737042d6c4 ("xen/x86: Convert to hotplug state machine")
Signed-off-by Arnd Bergmann <[email protected]>
---
 arch/x86/xen/enlighten.c | 2 ++
 1 file changed, 2 insertions(+)
arch/x86/xen/enlighten.c +2 -0
index c0fdd57da7aa..bdd855685403 100644
@@ -1837,6 +1837,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)
 {

@@ -1887,6 +1888,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)
 {
Signature · 7 lines
2.9.0


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel
reviewer Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Arnd Bergmann

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 4d737042d6c4 ("xen/x86: Convert to hotplug state machine")
Signed-off-by Arnd Bergmann <[email protected]>
Reviewed-by Boris Ostrovsky <[email protected]>

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel

reviewer Reviewed-by on v1 1/1
#2 lore raw
In reply to Arnd Bergmann
Quoted 9 lines · Arnd Bergmann

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 4d737042d6c4 ("xen/x86: Convert to hotplug state machine")
Signed-off-by Arnd Bergmann <[email protected]>
Reviewed-by Boris Ostrovsky <[email protected]>