x86: hyperv: fix build in !CONFIG_KEXEC_CORE case
Subsystems (2)
PATCH v3 1/1 x86: hyperv: fix build in !CONFIG_KEXEC_CORE case
Recent changes in Hyper-V driver ("Drivers: hv: vmbus: add special crash handler") broke the build when CONFIG_KEXEC_CORE is not set:
arch/x86/built-in.o: In function `hv_machine_crash_shutdown':arch/x86/kernel/cpu/mshyperv.c:112: undefined reference to `native_machine_crash_shutdown'
Decorate all kexec related code with #ifdef CONFIG_KEXEC_CORE.
---
Changes since v2:
- Hide hv_kexec_handler/hv_crash_handler under IS_ENABLED(CONFIG_HYPERV) to avoid warings in !CONFIG_HYPERV && !CONFIG_KEXEC case [kbuild robot]
Changes since v1:
- Previously I tried solving the issue by defining native_machine_crash_shutdown in !CONFIG_KEXEC_CORE case:
https://lkml.org/lkml/2015/8/11/417. This was to avoid having #ifdefs
in C code [Greg KH]. Such approach, however, raised a question on bloating kernel with unneeded stuff [Ingo Molnar].
--- arch/x86/kernel/cpu/mshyperv.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
arch/x86/kernel/cpu/mshyperv.c +7 -5
@@ -34,11 +34,10 @@struct ms_hyperv_info ms_hyperv;EXPORT_SYMBOL_GPL (ms_hyperv); -static void (*hv_kexec_handler)(void ); -static void (*hv_crash_handler)(struct pt_regs *regs); -#if IS_ENABLED (CONFIG_HYPERV )static void (*vmbus_handler)(void ); +static void (*hv_kexec_handler)(void ); +static void (*hv_crash_handler)(struct pt_regs *regs);void hyperv_vector_handler (struct pt_regs *regs) {
@@ -96,8 +95,8 @@ void hv_remove_crash_handler(void) hv_crash_handler =NULL ; }EXPORT_SYMBOL_GPL (hv_remove_crash_handler); -#endif +#ifdef CONFIG_KEXEC_CORE static void hv_machine_shutdown (void ) {if (kexec_in_progress && hv_kexec_handler)
@@ -111,7 +110,8 @@ static void hv_machine_crash_shutdown(struct pt_regs *regs)hv_crash_handler (regs);native_machine_crash_shutdown (regs); } - +#endif /* CONFIG_KEXEC_CORE */ +#endif /* CONFIG_HYPERV */ static uint32_t __init ms_hyperv_platform (void ) {
@@ -186,8 +186,10 @@ static void __init ms_hyperv_init_platform(void) no_timer_check =1 ;#endif +#if IS_ENABLED (CONFIG_HYPERV ) && defined(CONFIG_KEXEC_CORE ) machine_ops.shutdown = hv_machine_shutdown; machine_ops.crash_shutdown = hv_machine_crash_shutdown; +#endif mark_tsc_unstable ("running on Hyper-V" ); }
Signature · 1 line
2.4.3
tip-bot for Vitaly Kuznetsov
merge bot[tip:x86/urgent] x86: Hyperv: fix build in %21CONFIG_KEXEC_CORE case
x86: Hyperv: fix build in %21CONFIG_KEXEC_CORE case
Commit-ID: 353ebaa0ed39d57905eb197291c50395aee5e092 Gitweb: http://git.kernel.org/tip/353ebaa0ed39d57905eb197291c50395aee5e092 Author: Vitaly Kuznetsov <[email protected]> AuthorDate: Wed, 23 Sep 2015 12:02:57 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Mon, 28 Sep 2015 18:34:00 +0200
x86: Hyperv: fix build in %21CONFIG_KEXEC_CORE case
Recent changes in Hyper-V driver ("Drivers: hv: vmbus: add special crash handler") broke the build when CONFIG_KEXEC_CORE is not set:
arch/x86/built-in.o: In function `hv_machine_crash_shutdown':arch/x86/kernel/cpu/mshyperv.c:112: undefined reference to `native_machine_crash_shutdown'
Decorate all kexec related code with #ifdef CONFIG_KEXEC_CORE.
--- arch/x86/kernel/cpu/mshyperv.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
arch/x86/kernel/cpu/mshyperv.c +7 -5
@@ -34,11 +34,10 @@struct ms_hyperv_info ms_hyperv;EXPORT_SYMBOL_GPL (ms_hyperv); -static void (*hv_kexec_handler)(void ); -static void (*hv_crash_handler)(struct pt_regs *regs); -#if IS_ENABLED (CONFIG_HYPERV )static void (*vmbus_handler)(void ); +static void (*hv_kexec_handler)(void ); +static void (*hv_crash_handler)(struct pt_regs *regs);void hyperv_vector_handler (struct pt_regs *regs) {
@@ -96,8 +95,8 @@ void hv_remove_crash_handler(void) hv_crash_handler =NULL ; }EXPORT_SYMBOL_GPL (hv_remove_crash_handler); -#endif +#ifdef CONFIG_KEXEC_CORE static void hv_machine_shutdown (void ) {if (kexec_in_progress && hv_kexec_handler)
@@ -111,7 +110,8 @@ static void hv_machine_crash_shutdown(struct pt_regs *regs)hv_crash_handler (regs);native_machine_crash_shutdown (regs); } - +#endif /* CONFIG_KEXEC_CORE */ +#endif /* CONFIG_HYPERV */ static uint32_t __init ms_hyperv_platform (void ) {
@@ -186,8 +186,10 @@ static void __init ms_hyperv_init_platform(void) no_timer_check =1 ;#endif +#if IS_ENABLED (CONFIG_HYPERV ) && defined(CONFIG_KEXEC_CORE ) machine_ops.shutdown = hv_machine_shutdown; machine_ops.crash_shutdown = hv_machine_crash_shutdown; +#endif mark_tsc_unstable ("running on Hyper-V" ); }
tip-bot for Vitaly Kuznetsov
merge bot[tip:x86/urgent] x86/hyperv: Fix the build in the CONFIG_KEXEC_CORE=y case
In reply to Vitaly Kuznetsovx86/hyperv: Fix the build in the CONFIG_KEXEC_CORE=y case
Commit-ID: 7d381b749a010ccd48d5649c843cac0d14d1c229 Gitweb: http://git.kernel.org/tip/7d381b749a010ccd48d5649c843cac0d14d1c229 Author: Vitaly Kuznetsov <[email protected]> AuthorDate: Wed, 23 Sep 2015 12:02:57 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 29 Sep 2015 09:37:06 +0200
x86/hyperv: Fix the build in the CONFIG_KEXEC_CORE=y case
Recent changes in the Hyper-V driver:
b4370df2b1f5 ("Drivers: hv: vmbus: add special crash handler")
broke the build when CONFIG_KEXEC_CORE is not set:
arch/x86/built-in.o: In function `hv_machine_crash_shutdown':
arch/x86/kernel/cpu/mshyperv.c:112: undefined reference to `native_machine_crash_shutdown'
Decorate all kexec related code with #ifdef CONFIG_KEXEC_CORE.
--- arch/x86/kernel/cpu/mshyperv.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
arch/x86/kernel/cpu/mshyperv.c +7 -5
@@ -34,11 +34,10 @@struct ms_hyperv_info ms_hyperv;EXPORT_SYMBOL_GPL (ms_hyperv); -static void (*hv_kexec_handler)(void ); -static void (*hv_crash_handler)(struct pt_regs *regs); -#if IS_ENABLED (CONFIG_HYPERV )static void (*vmbus_handler)(void ); +static void (*hv_kexec_handler)(void ); +static void (*hv_crash_handler)(struct pt_regs *regs);void hyperv_vector_handler (struct pt_regs *regs) {
@@ -96,8 +95,8 @@ void hv_remove_crash_handler(void) hv_crash_handler =NULL ; }EXPORT_SYMBOL_GPL (hv_remove_crash_handler); -#endif +#ifdef CONFIG_KEXEC_CORE static void hv_machine_shutdown (void ) {if (kexec_in_progress && hv_kexec_handler)
@@ -111,7 +110,8 @@ static void hv_machine_crash_shutdown(struct pt_regs *regs)hv_crash_handler (regs);native_machine_crash_shutdown (regs); } - +#endif /* CONFIG_KEXEC_CORE */ +#endif /* CONFIG_HYPERV */ static uint32_t __init ms_hyperv_platform (void ) {
@@ -186,8 +186,10 @@ static void __init ms_hyperv_init_platform(void) no_timer_check =1 ;#endif +#if IS_ENABLED (CONFIG_HYPERV ) && defined(CONFIG_KEXEC_CORE ) machine_ops.shutdown = hv_machine_shutdown; machine_ops.crash_shutdown = hv_machine_crash_shutdown; +#endif mark_tsc_unstable ("running on Hyper-V" ); }
Re: [tip:x86/urgent] x86/hyperv: Fix the build in the CONFIG_KEXEC_CORE=y case
Quoted 8 lines · tip-bot for Vitaly Kuznetsov
Commit-ID: 7d381b749a010ccd48d5649c843cac0d14d1c229 Gitweb: http://git.kernel.org/tip/7d381b749a010ccd48d5649c843cac0d14d1c229 Author: Vitaly Kuznetsov <[email protected]> AuthorDate: Wed, 23 Sep 2015 12:02:57 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 29 Sep 2015 09:37:06 +0200x86/hyperv: Fix the build in the
CONFIG_KEXEC_CORE=ycase
It was '!CONFIG_KEXEC_CORE' in the original patch so I'd expect to see 'CONFIG_KEXEC_CORE=n' here (if the '!' sign causes issues).
[...]
Signature · 1 line
Vitaly
Re: [tip:x86/urgent] x86/hyperv: Fix the build in the CONFIG_KEXEC_CORE=y case
Quoted 9 lines · Vitaly Kuznetsov
Quoted 7 lines · tip-bot for Vitaly Kuznetsov
Commit-ID: 7d381b749a010ccd48d5649c843cac0d14d1c229 Gitweb: http://git.kernel.org/tip/7d381b749a010ccd48d5649c843cac0d14d1c229 Author: Vitaly Kuznetsov <[email protected]> AuthorDate: Wed, 23 Sep 2015 12:02:57 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 29 Sep 2015 09:37:06 +0200
Quoted 6 lines
Quoted 1 line
x86/hyperv: Fix the build in the
CONFIG_KEXEC_CORE=ycaseIt was '!CONFIG_KEXEC_CORE' in the original patch so I'd expect to see '
CONFIG_KEXEC_CORE=n' here (if the '!' sign causes issues).[...]
Ok, fixed it up.
Thanks,
Ingo
tip-bot for Vitaly Kuznetsov
merge bot[tip:x86/urgent] x86/hyperv: Fix the build in the !CONFIG_KEXEC_CORE case
In reply to Vitaly Kuznetsovx86/hyperv: Fix the build in the !CONFIG_KEXEC_CORE case
Commit-ID: 1e034743e918d195d339af340ae933727c072bce Gitweb: http://git.kernel.org/tip/1e034743e918d195d339af340ae933727c072bce Author: Vitaly Kuznetsov <[email protected]> AuthorDate: Wed, 23 Sep 2015 12:02:57 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 30 Sep 2015 07:44:15 +0200
x86/hyperv: Fix the build in the !CONFIG_KEXEC_CORE case
Recent changes in the Hyper-V driver:
b4370df2b1f5 ("Drivers: hv: vmbus: add special crash handler")
broke the build when CONFIG_KEXEC_CORE is not set:
arch/x86/built-in.o: In function `hv_machine_crash_shutdown':
arch/x86/kernel/cpu/mshyperv.c:112: undefined reference to `native_machine_crash_shutdown'
Decorate all kexec related code with #ifdef CONFIG_KEXEC_CORE.
--- arch/x86/kernel/cpu/mshyperv.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
arch/x86/kernel/cpu/mshyperv.c +7 -5
@@ -34,11 +34,10 @@struct ms_hyperv_info ms_hyperv;EXPORT_SYMBOL_GPL (ms_hyperv); -static void (*hv_kexec_handler)(void ); -static void (*hv_crash_handler)(struct pt_regs *regs); -#if IS_ENABLED (CONFIG_HYPERV )static void (*vmbus_handler)(void ); +static void (*hv_kexec_handler)(void ); +static void (*hv_crash_handler)(struct pt_regs *regs);void hyperv_vector_handler (struct pt_regs *regs) {
@@ -96,8 +95,8 @@ void hv_remove_crash_handler(void) hv_crash_handler =NULL ; }EXPORT_SYMBOL_GPL (hv_remove_crash_handler); -#endif +#ifdef CONFIG_KEXEC_CORE static void hv_machine_shutdown (void ) {if (kexec_in_progress && hv_kexec_handler)
@@ -111,7 +110,8 @@ static void hv_machine_crash_shutdown(struct pt_regs *regs)hv_crash_handler (regs);native_machine_crash_shutdown (regs); } - +#endif /* CONFIG_KEXEC_CORE */ +#endif /* CONFIG_HYPERV */ static uint32_t __init ms_hyperv_platform (void ) {
@@ -186,8 +186,10 @@ static void __init ms_hyperv_init_platform(void) no_timer_check =1 ;#endif +#if IS_ENABLED (CONFIG_HYPERV ) && defined(CONFIG_KEXEC_CORE ) machine_ops.shutdown = hv_machine_shutdown; machine_ops.crash_shutdown = hv_machine_crash_shutdown; +#endif mark_tsc_unstable ("running on Hyper-V" ); }