From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752739AbeC3Wme (ORCPT ); Fri, 30 Mar 2018 18:42:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:39860 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752478AbeC3Wmc (ORCPT ); Fri, 30 Mar 2018 18:42:32 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2C8EE217D2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=helgaas@kernel.org Date: Fri, 30 Mar 2018 17:42:29 -0500 From: Bjorn Helgaas To: Mathieu Malaterre Cc: Bjorn Helgaas , Wei Yang , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH] PCI/IOV: Add missing prototype for powerpc specific Message-ID: <20180330224229.GF9322@bhelgaas-glaptop.roam.corp.google.com> References: <20180322203355.26448-1-malat@debian.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20180322203355.26448-1-malat@debian.org> User-Agent: Mutt/1.9.2 (2017-12-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Mar 22, 2018 at 09:33:55PM +0100, Mathieu Malaterre wrote: > Some prototypes for weak functions were missing for powerpc specific > functions. Add the missing prototypes to the CONFIG_PCI_IOV block. This > fixes the following three warnings treated as error when using W=1: > > arch/powerpc/kernel/pci-common.c:236:17: error: no previous prototype for ‘pcibios_default_alignment’ [-Werror=missing-prototypes] > arch/powerpc/kernel/pci-common.c:253:5: error: no previous prototype for ‘pcibios_sriov_enable’ [-Werror=missing-prototypes] > arch/powerpc/kernel/pci-common.c:261:5: error: no previous prototype for ‘pcibios_sriov_disable’ [-Werror=missing-prototypes] > > Also in commit 978d2d683123 ("PCI: Add pcibios_iov_resource_alignment() > interface") a new function was added but the prototype was located in the > main header instead of the CONFIG_PCI_IOV specific section. Move this > function next to the newly added ones. > > Signed-off-by: Mathieu Malaterre Applied to pci/virtualization for v4.17, thanks! > --- > include/linux/pci.h | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 024a1beda008..f43b43b9b643 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -1295,7 +1295,6 @@ unsigned char pci_bus_max_busnr(struct pci_bus *bus); > void pci_setup_bridge(struct pci_bus *bus); > resource_size_t pcibios_window_alignment(struct pci_bus *bus, > unsigned long type); > -resource_size_t pcibios_iov_resource_alignment(struct pci_dev *dev, int resno); > > #define PCI_VGA_STATE_CHANGE_BRIDGE (1 << 0) > #define PCI_VGA_STATE_CHANGE_DECODES (1 << 1) > @@ -1923,6 +1922,7 @@ void pcibios_release_device(struct pci_dev *dev); > void pcibios_penalize_isa_irq(int irq, int active); > int pcibios_alloc_irq(struct pci_dev *dev); > void pcibios_free_irq(struct pci_dev *dev); > +resource_size_t pcibios_default_alignment(void); > > #ifdef CONFIG_HIBERNATE_CALLBACKS > extern struct dev_pm_ops pcibios_pm_ops; > @@ -1955,6 +1955,11 @@ int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs); > int pci_sriov_get_totalvfs(struct pci_dev *dev); > resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno); > void pci_vf_drivers_autoprobe(struct pci_dev *dev, bool probe); > + > +/* Arch may override these (weak) */ > +int pcibios_sriov_enable(struct pci_dev *pdev, u16 num_vfs); > +int pcibios_sriov_disable(struct pci_dev *pdev); > +resource_size_t pcibios_iov_resource_alignment(struct pci_dev *dev, int resno); > #else > static inline int pci_iov_virtfn_bus(struct pci_dev *dev, int id) > { > -- > 2.11.0 >