ForkOn Fri, 28 Dec 2018 01:46:38 +0900,
Guenter Roeck wrote:
>
> h8300 builds fail with:
>
> In file included from drivers/of/address.c:11:
> include/linux/pci.h:1966:20: error: redefinition of 'pcibios_penalize_isa_irq'
>
> This is because CONFIG_PCI is not enabled, and pcibios_penalize_isa_irq()
> is now declared as inline static function in generic code if this is the
> case. Since h8300 does not support PCI to start with, fix the problem by
> removing the architecture specific pci.h.
>
> Fixes: 5d32a66541c46 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
> Cc: Sinan Kaya <okaya****@kerne*****>
> Cc: Bjorn Helgaas <bhelg****@googl*****>
> Signed-off-by: Guenter Roeck <linux****@roeck*****>
> ---
> arch/h8300/include/asm/Kbuild | 1 +
> arch/h8300/include/asm/pci.h | 18 ------------------
> 2 files changed, 1 insertion(+), 18 deletions(-)
> delete mode 100644 arch/h8300/include/asm/pci.h
>
> diff --git a/arch/h8300/include/asm/Kbuild b/arch/h8300/include/asm/Kbuild
> index a5d0b2991f47..cd400d353d18 100644
> --- a/arch/h8300/include/asm/Kbuild
> +++ b/arch/h8300/include/asm/Kbuild
> @@ -33,6 +33,7 @@ generic-y += mmu.h
> generic-y += mmu_context.h
> generic-y += module.h
> generic-y += parport.h
> +generic-y += pci.h
> generic-y += percpu.h
> generic-y += pgalloc.h
> generic-y += preempt.h
> diff --git a/arch/h8300/include/asm/pci.h b/arch/h8300/include/asm/pci.h
> deleted file mode 100644
> index d4d345a52092..000000000000
> --- a/arch/h8300/include/asm/pci.h
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> -#ifndef _ASM_H8300_PCI_H
> -#define _ASM_H8300_PCI_H
> -
> -/*
> - * asm-h8300/pci.h - H8/300 specific PCI declarations.
> - *
> - * Yoshinori Sato <ysato****@users*****>
> - */
> -
> -#define pcibios_assign_all_busses() 0
> -
> -static inline void pcibios_penalize_isa_irq(int irq, int active)
> -{
> - /* We don't do dynamic PCI IRQ allocation */
> -}
> -
> -#endif /* _ASM_H8300_PCI_H */
> --
> 2.7.4
>
OK.
Applied h8300-next.
--
Yosinori Sato