lkml.org 
[lkml]   [2017]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 01/10] x86/hyper-v: include hyperv/ only when CONFIG_HYPERV is set
    Date
    Code is arch/x86/hyperv/ is only needed when CONFIG_HYPERV is set, the
    'basic' support and detection lives in arch/x86/kernel/cpu/mshyperv.c
    which is included when CONFIG_HYPERVISOR_GUEST is set.

    Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
    Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
    ---
    Changes since v5:
    - Implement hv_is_hypercall_page_setup in one line for !CONFIG_HYPERV
    case [Andy Shevchenko]
    - Use "subst m,y," in Kbuild [Andy Shevchenko]
    ---
    arch/x86/Kbuild | 2 +-
    arch/x86/include/asm/mshyperv.h | 7 ++++++-
    2 files changed, 7 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild
    index 586b786..3e6f640 100644
    --- a/arch/x86/Kbuild
    +++ b/arch/x86/Kbuild
    @@ -8,7 +8,7 @@ obj-$(CONFIG_KVM) += kvm/
    obj-$(CONFIG_XEN) += xen/

    # Hyper-V paravirtualization support
    -obj-$(CONFIG_HYPERVISOR_GUEST) += hyperv/
    +obj-$(subst m,y,$(CONFIG_HYPERV)) += hyperv/

    # lguest paravirtualization support
    obj-$(CONFIG_LGUEST_GUEST) += lguest/
    diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h
    index fba1007..945b74e 100644
    --- a/arch/x86/include/asm/mshyperv.h
    +++ b/arch/x86/include/asm/mshyperv.h
    @@ -175,7 +175,12 @@ void hyperv_init(void);
    void hyperv_report_panic(struct pt_regs *regs);
    bool hv_is_hypercall_page_setup(void);
    void hyperv_cleanup(void);
    -#endif
    +#else /* CONFIG_HYPERV */
    +static inline void hyperv_init(void) {}
    +static inline bool hv_is_hypercall_page_setup(void) { return false; }
    +static inline hyperv_cleanup(void) {}
    +#endif /* CONFIG_HYPERV */
    +
    #ifdef CONFIG_HYPERV_TSCPAGE
    struct ms_hyperv_tsc_page *hv_get_tsc_page(void);
    static inline u64 hv_read_tsc_page(const struct ms_hyperv_tsc_page *tsc_pg)
    --
    2.9.4
    \
     
     \ /
      Last update: 2017-06-01 19:51    [W:2.540 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site