2016-03-15 11:06:25

by Joao Pinto

Subject: [PATCH] Remove the inclusion of pci-bridge.h and pci-dma-compat.h

While building linux-next the test robot detected that the pci.h was including
two removed header files (pci-dma-compat.h and pci-bridge.h) causing the
process to fail:
http://lists.infradead.org/pipermail/linux-snps-arc/2016-March/000711.html

This patch has the goal to fix the build problem.

Signed-off-by: Joao Pinto <[email protected]>
---
arch/arc/include/asm/pci.h | 3 ---
1 file changed, 3 deletions(-)

diff --git a/arch/arc/include/asm/pci.h b/arch/arc/include/asm/pci.h
index 2f2011c..ba56c23 100644
--- a/arch/arc/include/asm/pci.h
+++ b/arch/arc/include/asm/pci.h
@@ -10,9 +10,6 @@
#define _ASM_ARC_PCI_H

#ifdef __KERNEL__
-#include <asm-generic/pci-dma-compat.h>
-#include <asm-generic/pci-bridge.h>
-
#include <linux/ioport.h>

#define PCIBIOS_MIN_IO 0x100
--
1.8.1.5

2016-03-15 11:14:10

by Vineet Gupta

Subject: Re: [PATCH] Remove the inclusion of pci-bridge.h and pci-dma-compat.h

On Tuesday 15 March 2016 04:36 PM, Joao Pinto wrote:
> While building linux-next the test robot detected that the pci.h was including
> two removed header files (pci-dma-compat.h and pci-bridge.h) causing the
> process to fail:
> http://lists.infradead.org/pipermail/linux-snps-arc/2016-March/000711.html
>
> This patch has the goal to fix the build problem.
>
> Signed-off-by: Joao Pinto <[email protected]>

Acked-by: Vineet Gupta <[email protected]>

@Bjorn since the ARC PCI support is still not upstream, and was slated to go via
you, please pick this one up as well.

Thx,
-Vineet

> ---
> arch/arc/include/asm/pci.h | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/arch/arc/include/asm/pci.h b/arch/arc/include/asm/pci.h
> index 2f2011c..ba56c23 100644
> --- a/arch/arc/include/asm/pci.h
> +++ b/arch/arc/include/asm/pci.h
> @@ -10,9 +10,6 @@
> #define _ASM_ARC_PCI_H
>
> #ifdef __KERNEL__
> -#include <asm-generic/pci-dma-compat.h>
> -#include <asm-generic/pci-bridge.h>
> -
> #include <linux/ioport.h>
>
> #define PCIBIOS_MIN_IO 0x100

2016-03-15 13:51:34

by Bjorn Helgaas

Subject: Re: [PATCH] Remove the inclusion of pci-bridge.h and pci-dma-compat.h

On Tue, Mar 15, 2016 at 11:06:02AM +0000, Joao Pinto wrote:
> While building linux-next the test robot detected that the pci.h was including
> two removed header files (pci-dma-compat.h and pci-bridge.h) causing the
> process to fail:
> http://lists.infradead.org/pipermail/linux-snps-arc/2016-March/000711.html
>
> This patch has the goal to fix the build problem.
>
> Signed-off-by: Joao Pinto <[email protected]>

Thanks, Joao, I folded this fix into the original commit. I should have
caught this myself, since I'm the one who removed pci-bridge.h.

> ---
> arch/arc/include/asm/pci.h | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/arch/arc/include/asm/pci.h b/arch/arc/include/asm/pci.h
> index 2f2011c..ba56c23 100644
> --- a/arch/arc/include/asm/pci.h
> +++ b/arch/arc/include/asm/pci.h
> @@ -10,9 +10,6 @@
> #define _ASM_ARC_PCI_H
>
> #ifdef __KERNEL__
> -#include <asm-generic/pci-dma-compat.h>
> -#include <asm-generic/pci-bridge.h>
> -
> #include <linux/ioport.h>
>
> #define PCIBIOS_MIN_IO 0x100
> --
> 1.8.1.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2016-03-15 14:24:10

by Joao Pinto

Subject: Re: [PATCH] Remove the inclusion of pci-bridge.h and pci-dma-compat.h

No problem! Thanks!

On 3/15/2016 1:51 PM, Bjorn Helgaas wrote:
> On Tue, Mar 15, 2016 at 11:06:02AM +0000, Joao Pinto wrote:
>> While building linux-next the test robot detected that the pci.h was including
>> two removed header files (pci-dma-compat.h and pci-bridge.h) causing the
>> process to fail:
>> http://lists.infradead.org/pipermail/linux-snps-arc/2016-March/000711.html
>>
>> This patch has the goal to fix the build problem.
>>
>> Signed-off-by: Joao Pinto <[email protected]>
>
> Thanks, Joao, I folded this fix into the original commit. I should have
> caught this myself, since I'm the one who removed pci-bridge.h.
>
>> ---
>> arch/arc/include/asm/pci.h | 3 ---
>> 1 file changed, 3 deletions(-)
>>
>> diff --git a/arch/arc/include/asm/pci.h b/arch/arc/include/asm/pci.h
>> index 2f2011c..ba56c23 100644
>> --- a/arch/arc/include/asm/pci.h
>> +++ b/arch/arc/include/asm/pci.h
>> @@ -10,9 +10,6 @@
>> #define _ASM_ARC_PCI_H
>>
>> #ifdef __KERNEL__
>> -#include <asm-generic/pci-dma-compat.h>
>> -#include <asm-generic/pci-bridge.h>
>> -
>> #include <linux/ioport.h>
>>
>> #define PCIBIOS_MIN_IO 0x100
>> --
>> 1.8.1.5
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
>> the body of a message to [email protected]
>> More majordomo info at http://vger.kernel.org/majordomo-info.html