lkml.org 
[lkml]   [2012]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] PCI: Increase resource array mask bit size in pcim_iomap_regions()
    Date
    DEVICE_COUNT_RESOURCE will be bigger than 16 when SRIOV supported is enabled.

    Let them pass with int just like pci_enable_resources().

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>

    ---
    include/linux/pci.h | 6 +++---
    lib/devres.c | 6 +++---
    2 files changed, 6 insertions(+), 6 deletions(-)

    Index: linux-2.6/include/linux/pci.h
    ===================================================================
    --- linux-2.6.orig/include/linux/pci.h
    +++ linux-2.6/include/linux/pci.h
    @@ -1433,10 +1433,10 @@ static inline void pci_fixup_device(enum
    void __iomem *pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen);
    void pcim_iounmap(struct pci_dev *pdev, void __iomem *addr);
    void __iomem * const *pcim_iomap_table(struct pci_dev *pdev);
    -int pcim_iomap_regions(struct pci_dev *pdev, u16 mask, const char *name);
    -int pcim_iomap_regions_request_all(struct pci_dev *pdev, u16 mask,
    +int pcim_iomap_regions(struct pci_dev *pdev, int mask, const char *name);
    +int pcim_iomap_regions_request_all(struct pci_dev *pdev, int mask,
    const char *name);
    -void pcim_iounmap_regions(struct pci_dev *pdev, u16 mask);
    +void pcim_iounmap_regions(struct pci_dev *pdev, int mask);

    extern int pci_pci_problems;
    #define PCIPCI_FAIL 1 /* No PCI PCI DMA */
    Index: linux-2.6/lib/devres.c
    ===================================================================
    --- linux-2.6.orig/lib/devres.c
    +++ linux-2.6/lib/devres.c
    @@ -253,7 +253,7 @@ EXPORT_SYMBOL(pcim_iounmap);
    *
    * Request and iomap regions specified by @mask.
    */
    -int pcim_iomap_regions(struct pci_dev *pdev, u16 mask, const char *name)
    +int pcim_iomap_regions(struct pci_dev *pdev, int mask, const char *name)
    {
    void __iomem * const *iomap;
    int i, rc;
    @@ -306,7 +306,7 @@ EXPORT_SYMBOL(pcim_iomap_regions);
    *
    * Request all PCI BARs and iomap regions specified by @mask.
    */
    -int pcim_iomap_regions_request_all(struct pci_dev *pdev, u16 mask,
    +int pcim_iomap_regions_request_all(struct pci_dev *pdev, int mask,
    const char *name)
    {
    int request_mask = ((1 << 6) - 1) & ~mask;
    @@ -330,7 +330,7 @@ EXPORT_SYMBOL(pcim_iomap_regions_request
    *
    * Unmap and release regions specified by @mask.
    */
    -void pcim_iounmap_regions(struct pci_dev *pdev, u16 mask)
    +void pcim_iounmap_regions(struct pci_dev *pdev, int mask)
    {
    void __iomem * const *iomap;
    int i;

    \
     
     \ /
      Last update: 2012-01-05 00:53    [W:0.023 / U:34.056 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site