Messages in this thread Patch in this message | | | Date | Wed, 30 Oct 2013 15:19:28 -0700 (PDT) | From | David Rientjes <> | Subject | [patch x86/hyperv resend] x86, hyperv: Fix build error |
| |
9e7827b5ea4c ("x86, hyperv: Get the local APIC timer frequency from the hypervisor") breaks the build when CONFIG_SMP is disabled because apic.h isn't directly included:
arch/x86/kernel/cpu/mshyperv.c: In function 'ms_hyperv_init_platform': arch/x86/kernel/cpu/mshyperv.c:90:3: error: 'lapic_timer_frequency' undeclared (first use in this function) arch/x86/kernel/cpu/mshyperv.c:90:3: note: each undeclared identifier is reported only once for each function it appears in
This happens because mshyperv.c includes linux/desc.h, which includes linux/smp.h, which includes asm/smp.h iff CONFIG_SMP is enabled, and asm/smp.h is what includes asm/apic.h for CONFIG_X86_LOCAL_APIC.
Fix it by directly including asm/apic.h.
Acked-by: "K. Y. Srinivasan" <kys@microsoft.com> Signed-off-by: David Rientjes <rientjes@google.com> --- arch/x86/kernel/cpu/mshyperv.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c --- a/arch/x86/kernel/cpu/mshyperv.c +++ b/arch/x86/kernel/cpu/mshyperv.c @@ -25,6 +25,7 @@ #include <asm/idle.h> #include <asm/irq_regs.h> #include <asm/i8259.h> +#include <asm/apic.h> struct ms_hyperv_info ms_hyperv; EXPORT_SYMBOL_GPL(ms_hyperv);
| |