diff mbox series

x86/PCI: Fix compile errors when CONFIG_PCI is disabled

Message ID 20211020102102.86577-1-hdegoede@redhat.com (mailing list archive)
State Not Applicable
Delegated to: Bjorn Helgaas
Headers show
Series x86/PCI: Fix compile errors when CONFIG_PCI is disabled | expand

Commit Message

Hans de Goede Oct. 20, 2021, 10:21 a.m. UTC
arch/x86/include/asm/pci_x86.h uses a number of data -types and defines
without including the headers which define these.

Instead so far it has been relying on files including it including the
necessary headers first.

Recently a include <asm/pci_x86.h> was added to arch/x86/kernel/resource.c
which does not include the necessary headers first.

Add the missing includes to arch/x86/include/asm/pci_x86.h to fix the
compile errors (with certain .config-s) when it is included from
arch/x86/kernel/resource.c.

Fixes: f10507a66e36 ("x86/PCI: Ignore E820 reservations for bridge windows on newer systems")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 arch/x86/include/asm/pci_x86.h | 3 +++
 1 file changed, 3 insertions(+)

Comments

Mika Westerberg Oct. 25, 2021, 9:50 a.m. UTC | #1
On Wed, Oct 20, 2021 at 12:21:02PM +0200, Hans de Goede wrote:
> arch/x86/include/asm/pci_x86.h uses a number of data -types and defines
> without including the headers which define these.
> 
> Instead so far it has been relying on files including it including the
> necessary headers first.
> 
> Recently a include <asm/pci_x86.h> was added to arch/x86/kernel/resource.c
> which does not include the necessary headers first.
> 
> Add the missing includes to arch/x86/include/asm/pci_x86.h to fix the
> compile errors (with certain .config-s) when it is included from
> arch/x86/kernel/resource.c.
> 
> Fixes: f10507a66e36 ("x86/PCI: Ignore E820 reservations for bridge windows on newer systems")
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Borislav Petkov Oct. 25, 2021, 10:02 a.m. UTC | #2
On Mon, Oct 25, 2021 at 12:50:19PM +0300, Mika Westerberg wrote:
> On Wed, Oct 20, 2021 at 12:21:02PM +0200, Hans de Goede wrote:
> > arch/x86/include/asm/pci_x86.h uses a number of data -types and defines
> > without including the headers which define these.
> > 
> > Instead so far it has been relying on files including it including the
> > necessary headers first.
> > 
> > Recently a include <asm/pci_x86.h> was added to arch/x86/kernel/resource.c
> > which does not include the necessary headers first.
> > 
> > Add the missing includes to arch/x86/include/asm/pci_x86.h to fix the
> > compile errors (with certain .config-s) when it is included from
> > arch/x86/kernel/resource.c.
> > 
> > Fixes: f10507a66e36 ("x86/PCI: Ignore E820 reservations for bridge windows on newer systems")
> > Reported-by: kernel test robot <lkp@intel.com>
> > Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> 
> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>

IIRC, this was squashed into the Fixes: patch:

https://lore.kernel.org/r/20211020211455.GA2641031@bhelgaas
diff mbox series

Patch

diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h
index 0bb4e7dd0ffc..c5413d8007ed 100644
--- a/arch/x86/include/asm/pci_x86.h
+++ b/arch/x86/include/asm/pci_x86.h
@@ -5,7 +5,10 @@ 
  *	(c) 1999 Martin Mares <mj@ucw.cz>
  */
 
+#include <linux/errno.h>
+#include <linux/init.h>
 #include <linux/ioport.h>
+#include <linux/spinlock.h>
 
 #undef DEBUG