diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-10-12 11:20:38 -0400 |
---|---|---|
committer | David Vrabel <david.vrabel@citrix.com> | 2016-10-24 10:49:07 -0400 |
commit | cb5f7e7c1ded5ff91b18116669c0f43c82bea3db (patch) | |
tree | cb80a4b843a575b7ed16460c57019d044469f079 /arch/x86/xen/enlighten.c | |
parent | 44b3c7af02ca2701b6b90ee30c9d1d9c3ae07653 (diff) |
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 <arnd@arndb.de>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Diffstat (limited to 'arch/x86/xen/enlighten.c')
-rw-r--r-- | arch/x86/xen/enlighten.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 96c2dea798a1..a637f902f59e 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
@@ -1838,6 +1838,7 @@ static void __init init_hvm_pv_info(void) | |||
1838 | 1838 | ||
1839 | xen_domain_type = XEN_HVM_DOMAIN; | 1839 | xen_domain_type = XEN_HVM_DOMAIN; |
1840 | } | 1840 | } |
1841 | #endif | ||
1841 | 1842 | ||
1842 | static int xen_cpu_up_prepare(unsigned int cpu) | 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 | return 0; | 1889 | return 0; |
1889 | } | 1890 | } |
1890 | 1891 | ||
1892 | #ifdef CONFIG_XEN_PVHVM | ||
1891 | #ifdef CONFIG_KEXEC_CORE | 1893 | #ifdef CONFIG_KEXEC_CORE |
1892 | static void xen_hvm_shutdown(void) | 1894 | static void xen_hvm_shutdown(void) |
1893 | { | 1895 | { |