[PATCH -next] x86/cyrix: include header linux/isa-dma.h

[PATCH -next] x86/cyrix: include header linux/isa-dma.h

[Randy Dunlap]

x86/kernel/cpu/cyrix.c now needs to include <linux/isa-dma.h>
since the 'isa_dma_bridge_buggy' variable was moved to it.

Fixes this build error:

../arch/x86/kernel/cpu/cyrix.c: In function ‘init_cyrix’:
../arch/x86/kernel/cpu/cyrix.c:277:17: error: ‘isa_dma_bridge_buggy’ undeclared (first use in this function)
  277 |                 isa_dma_bridge_buggy = 2;

Fixes: abb4970ac335 ("PCI: Move isa_dma_bridge_buggy out of asm/dma.h")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: x86@kernel.org
---
 arch/x86/kernel/cpu/cyrix.c |    1 +
 1 file changed, 1 insertion(+)

--- a/arch/x86/kernel/cpu/cyrix.c
+++ b/arch/x86/kernel/cpu/cyrix.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/isa-dma.h>
 #include <linux/pci.h>
 #include <asm/dma.h>
 #include <linux/io.h>

Re: [PATCH -next] x86/cyrix: include header linux/isa-dma.h

[Stafford Horne]

On Mon, Jul 25, 2022 at 01:22:24PM -0700, Randy Dunlap wrote:
> x86/kernel/cpu/cyrix.c now needs to include <linux/isa-dma.h>
> since the 'isa_dma_bridge_buggy' variable was moved to it.
> 
> Fixes this build error:
> 
> ../arch/x86/kernel/cpu/cyrix.c: In function ‘init_cyrix’:
> ../arch/x86/kernel/cpu/cyrix.c:277:17: error: ‘isa_dma_bridge_buggy’ undeclared (first use in this function)
>   277 |                 isa_dma_bridge_buggy = 2;
> 
> Fixes: abb4970ac335 ("PCI: Move isa_dma_bridge_buggy out of asm/dma.h")
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Stafford Horne <shorne@gmail.com>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: Dave Hansen <dave.hansen@linux.intel.com>
> Cc: x86@kernel.org

Acked-by: Stafford Horne <shorne@gmail.com>

> ---
>  arch/x86/kernel/cpu/cyrix.c |    1 +
>  1 file changed, 1 insertion(+)
> 
> --- a/arch/x86/kernel/cpu/cyrix.c
> +++ b/arch/x86/kernel/cpu/cyrix.c
> @@ -1,6 +1,7 @@
>  // SPDX-License-Identifier: GPL-2.0
>  #include <linux/bitops.h>
>  #include <linux/delay.h>
> +#include <linux/isa-dma.h>
>  #include <linux/pci.h>
>  #include <asm/dma.h>
>  #include <linux/io.h>

Sorry, I missed this, I did test several x86 configs, but I guess the cyrix.c
compilation was not picked up in my tests.

FWIW, I think this should go through Bjorn's pci tree.

-Stafford

Re: [PATCH -next] x86/cyrix: include header linux/isa-dma.h

[Bjorn Helgaas]

On Mon, Jul 25, 2022 at 01:22:24PM -0700, Randy Dunlap wrote:
> x86/kernel/cpu/cyrix.c now needs to include <linux/isa-dma.h>
> since the 'isa_dma_bridge_buggy' variable was moved to it.
> 
> Fixes this build error:
> 
> ../arch/x86/kernel/cpu/cyrix.c: In function ‘init_cyrix’:
> ../arch/x86/kernel/cpu/cyrix.c:277:17: error: ‘isa_dma_bridge_buggy’ undeclared (first use in this function)
>   277 |                 isa_dma_bridge_buggy = 2;
> 
> Fixes: abb4970ac335 ("PCI: Move isa_dma_bridge_buggy out of asm/dma.h")
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>

I appended this to my pci/header-cleanup-immutable branch for v5.20,
thanks!

> Cc: Stafford Horne <shorne@gmail.com>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: Dave Hansen <dave.hansen@linux.intel.com>
> Cc: x86@kernel.org
> ---
>  arch/x86/kernel/cpu/cyrix.c |    1 +
>  1 file changed, 1 insertion(+)
> 
> --- a/arch/x86/kernel/cpu/cyrix.c
> +++ b/arch/x86/kernel/cpu/cyrix.c
> @@ -1,6 +1,7 @@
>  // SPDX-License-Identifier: GPL-2.0
>  #include <linux/bitops.h>
>  #include <linux/delay.h>
> +#include <linux/isa-dma.h>
>  #include <linux/pci.h>
>  #include <asm/dma.h>
>  #include <linux/io.h>