linux-kernel - Re: [PATCH] PCI: Trivial comment fixup for PCI mmap ifdefs

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20200917170935.GA1710267@bjorn-Precision-5520>
Date:   Thu, 17 Sep 2020 12:09:35 -0500
From:   Bjorn Helgaas <helgaas@...nel.org>
To:     Clint Sbisa <csbisa@...zon.com>
Cc:     Bjorn Helgaas <bhelgaas@...gle.com>,
        Jiri Kosina <trivial@...nel.org>,
        Benjamin Herrenschmidt <benh@...zon.com>,
        Ali Saidi <alisaidi@...zon.com>,
        David Woodhouse <dwmw@...zon.co.uk>, linux-pci@...r.kernel.org,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH] PCI: Trivial comment fixup for PCI mmap ifdefs

On Fri, Aug 21, 2020 at 03:51:21PM +0000, Clint Sbisa wrote:
> The else/endif comments for pci_{create,remove}_resource_files were
> not updated in commit f719582435afe9c7985206e42d804ea6aa315d33 ("PCI:
> Add pci_mmap_resource_range() and use it for ARM64").
> 
> Signed-off-by: Clint Sbisa <csbisa@...zon.com>

Applied to pci/misc for v5.10, thanks!

> ---
>  drivers/pci/pci-sysfs.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
> index 6d78df981d41..cfc67b208616 100644
> --- a/drivers/pci/pci-sysfs.c
> +++ b/drivers/pci/pci-sysfs.c
> @@ -1196,10 +1196,10 @@ static int pci_create_resource_files(struct pci_dev *pdev)
>  	}
>  	return 0;
>  }
> -#else /* !HAVE_PCI_MMAP */
> +#else /* ! (defined(HAVE_PCI_MMAP) || defined(ARCH_GENERIC_PCI_MMAP_RESOURCE)) */
>  int __weak pci_create_resource_files(struct pci_dev *dev) { return 0; }
>  void __weak pci_remove_resource_files(struct pci_dev *dev) { return; }
> -#endif /* HAVE_PCI_MMAP */
> +#endif /* defined(HAVE_PCI_MMAP) || defined(ARCH_GENERIC_PCI_MMAP_RESOURCE) */
>  
>  /**
>   * pci_write_rom - used to enable access to the PCI ROM display
> -- 
> 2.23.3
>