Re: [PATCH][next] x86/hyper-v: add missing void return type to hyperv_cleanup declaration

From: Greg Kroah-Hartman
Date: Thu Jul 20 2017 - 05:15:55 EST


On Thu, Jul 20, 2017 at 10:52:36AM +0200, Ingo Molnar wrote:
>
> * Colin King <colin.king@xxxxxxxxxxxxx> wrote:
>
> > From: Colin Ian King <colin.king@xxxxxxxxxxxxx>
> >
> > Add in missing void return type, fixes sparse warning:
> > "warning: 'hyperv_cleanup()' has implicit return type"
> >
> > Fixes: 2e252fbf777d ("x86/hyper-v: include hyperv/ only when CONFIG_HYPERV is set")
> > Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx>
> > ---
> > arch/x86/include/asm/mshyperv.h | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h
> > index 01b9c0fb3aab..41fae263f8fa 100644
> > --- a/arch/x86/include/asm/mshyperv.h
> > +++ b/arch/x86/include/asm/mshyperv.h
> > @@ -178,7 +178,7 @@ void hyperv_cleanup(void);
> > #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) {}
> > +static inline void hyperv_cleanup(void) {}
> > #endif /* CONFIG_HYPERV */
>
> Guys, Greg, could we please move this commit from the drivers tree:
>
> 2e252fbf777d: x86/hyper-v: include hyperv/ only when CONFIG_HYPERV is set
>
> arch/x86/Kbuild | 2 +-
> arch/x86/include/asm/mshyperv.h | 7 ++++++-
>
> ... to the x86 tree where it belongs?

I've now reverted it from my tree entirely, sorry about that.

greg k-h