Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e034743 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Ingo Molnar
Browse files

x86/hyperv: Fix the build in the !CONFIG_KEXEC_CORE case 



Recent changes in the Hyper-V driver:

  b4370df2 ("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.

Reported-by: default avatarJim Davis <jim.epost@gmail.com>
Reported-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: devel@linuxdriverproject.org
Cc: K. Y. Srinivasan <kys@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/1443002577-25370-1-git-send-email-vkuznets@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent a7adb91b

arch/x86/kernel/cpu/mshyperv.c

+7 −5
Original line number Diff line number Diff line
@@ -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");

}