From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DD10C43387 for ; Fri, 28 Dec 2018 15:31:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0BB3420869 for ; Fri, 28 Dec 2018 15:31:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731755AbeL1Pb3 (ORCPT ); Fri, 28 Dec 2018 10:31:29 -0500 Received: from mail01.asahi-net.or.jp ([202.224.55.13]:55996 "EHLO mail01.asahi-net.or.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725792AbeL1Pb2 (ORCPT ); Fri, 28 Dec 2018 10:31:28 -0500 X-Greylist: delayed 573 seconds by postgrey-1.27 at vger.kernel.org; Fri, 28 Dec 2018 10:31:27 EST Received: from h61-195-96-97.vps.ablenet.jp (h61-195-96-97.vps.ablenet.jp [61.195.96.97]) (Authenticated sender: PQ4Y-STU) by mail01.asahi-net.or.jp (Postfix) with ESMTPA id B964D1005D8; Sat, 29 Dec 2018 00:21:53 +0900 (JST) Received: from yo-satoh-debian.ysato.ml (ZM005235.ppp.dion.ne.jp [222.8.5.235]) by h61-195-96-97.vps.ablenet.jp (Postfix) with ESMTPSA id 3A520240070; Sat, 29 Dec 2018 00:21:53 +0900 (JST) Date: Sat, 29 Dec 2018 00:21:47 +0900 Message-ID: <877eftu16c.wl-ysato@users.sourceforge.jp> From: Yoshinori Sato To: Guenter Roeck Cc: uclinux-h8-devel@lists.sourceforge.jp, linux-kernel@vger.kernel.org, Sinan Kaya , Bjorn Helgaas Subject: Re: [PATCH] h8300: pci: Remove local declaration of pcibios_penalize_isa_irq In-Reply-To: <1545929198-15733-1-git-send-email-linux@roeck-us.net> References: <1545929198-15733-1-git-send-email-linux@roeck-us.net> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL/10.8 EasyPG/1.0.0 Emacs/25.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 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 > Cc: Bjorn Helgaas > Signed-off-by: Guenter 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 > - */ > - > -#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