From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754300AbdFWKAN (ORCPT ); Fri, 23 Jun 2017 06:00:13 -0400 Received: from Galois.linutronix.de ([146.0.238.70]:59602 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753972AbdFWKAM (ORCPT ); Fri, 23 Jun 2017 06:00:12 -0400 Date: Fri, 23 Jun 2017 12:00:09 +0200 (CEST) From: Thomas Gleixner To: LKML cc: x86@kernel.org, Vitaly Kuznetsov , "K. Y. Srinivasan" , devel@linuxdriverproject.org Subject: Re: x86/mshyperv: Remove unneeded includes from mshyperv.h In-Reply-To: Message-ID: References: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 23 Jun 2017, Thomas Gleixner wrote: > A recent commit included linux/slab.h in linux/irq.h. This breaks the build > of vdso32 on a 64bit kernel. > > The reason is that linux/irq.h gets included into the vdso code via > linux/interrupt.h which is included from asm/mshyperv.h. That makes the > 32bit vdso compile fail, because slab.h includes the pgtable headers for > 64bit on a 64bit build. > > Neither linux/clocksource.h nor linux/interrupt.h are needed in the > mshyperv.h header file itself. > > Remove the includes and unbreak the build. > > Fixes: dee863b571b0 ("hv: export current Hyper-V clocksource") > Reported-by: Ingo Molnar > Signed-off-by: Thomas Gleixner > --- > > diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h > index fba100713924..2f4acbdbfc51 100644 > --- a/arch/x86/include/asm/mshyperv.h > +++ b/arch/x86/include/asm/mshyperv.h > @@ -2,8 +2,6 @@ > #define _ASM_X86_MSHYPER_H > > #include > -#include > -#include > #include Bah. this needs the following delta fix: --- a/arch/x86/include/asm/mshyperv.h +++ b/arch/x86/include/asm/mshyperv.h @@ -2,6 +2,7 @@ #define _ASM_X86_MSHYPER_H #include +#include #include /*